ref #10160: move preference to search

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SearchPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SearchPreferences.java
index 16fed3cb9e17c049fa2c5d5633d82a42b19ca375..9eff758c6f86623b6340da3565a32b27c73133f7 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SearchPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SearchPreferences.java
@@ -8,25 +8,48 @@
 */
 package eu.etaxonomy.taxeditor.preference;
 
+import org.eclipse.jface.preference.BooleanFieldEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.RowLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.internal.Workbench;
 
+import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.preference.menu.CdmPreferencePage;
+import eu.etaxonomy.taxeditor.preference.menu.FieldEditorPreferencePageE4;
 
 /**
  * @author k.luther
  * @since 18.01.2019
  *
  */
-public class SearchPreferences extends CdmPreferencePage {
+public class SearchPreferences extends FieldEditorPreferencePageE4 {
 
+       private BooleanFieldEditor searchEditor;
     /**
      * {@inheritDoc}
      */
-    @Override
-    protected Control createContents(Composite parent) {
-        noDefaultAndApplyButton();
-        return null;
+       @Override
+       protected void createFieldEditors() {
+       searchEditor = new BooleanFieldEditor(PreferencesUtil.createPreferenceString(
+                               IPreferenceKeys.SEARCH_OPEN_RESULTS_IN_SEPARATE_WINDOWS),
+                               Messages.TaxonomicEditorGeneralPreferences_search_window,
+                       getFieldEditorParent());
+       addField(searchEditor);
+       Composite composite = new Composite(getFieldEditorParent(), SWT.NULL);
+        composite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1));
+        composite.setLayout(new RowLayout(1));
     }
+    
+    @Override
+       protected void initialize() {
+           super.initialize();
+           //TODO this is a q&d hack to make the e3 preference work
+           searchEditor.setPreferenceStore(Workbench.getInstance().getPreferenceStore());
+           searchEditor.load();
+       }
 
+       
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java
index 24dec7eaead38e2bc89dbe3da46594c5b37200ef..2cc8cb782e53082c6d1de6e4088fd5d601acef55 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java
@@ -61,10 +61,10 @@ public class TaxonomicEditorGeneralPreferences extends
 //             addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(
 //                             IPreferenceKeys.SHOW_EXPERIMENTAL_FEATURES),
 //                             "Show experimental features", getFieldEditorParent()));
-               addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(
-                               IPreferenceKeys.SEARCH_OPEN_RESULTS_IN_SEPARATE_WINDOWS),
-                               Messages.TaxonomicEditorGeneralPreferences_search_window,
-                       getFieldEditorParent()));
+//             addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(
+//                             IPreferenceKeys.SEARCH_OPEN_RESULTS_IN_SEPARATE_WINDOWS),
+//                             Messages.TaxonomicEditorGeneralPreferences_search_window,
+//                     getFieldEditorParent()));
 //             addField(new BooleanFieldEditor(PreferencesUtil.createPreferenceString(IPreferenceKeys.SORT_TAXA_BY_RANK_AND_NAME),
 //                "In selection dialogs for taxa, sort by rank and name",
 //                getFieldEditorParent()));