fix taxon search configurator preference

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
index 89a3a1fc9b0689857908092066bd0522182b4138..6c7126116c3d840410918476f7bae0172760b689 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
@@ -338,7 +338,7 @@ public class SearchBar implements IContextListener{
                                configurator.setDoNamesWithoutTaxa(configurator.isDoNamesWithoutTaxa() ? false : true);
                                break;
                        case COMMON_NAME:
-                               configurator.setDoTaxaByCommonNames(getConfigurator().isDoTaxaByCommonNames() ? false : true);
+                               configurator.setDoTaxaByCommonNames(configurator.isDoTaxaByCommonNames() ? false : true);
                                break;
                        }
 
@@ -350,8 +350,9 @@ public class SearchBar implements IContextListener{
                }
 
                private void saveConfigurator() {
-                       PreferencesUtil.setSearchConfigurator(getConfigurator());
-                       this.configurator = PreferencesUtil.getSearchConfigurator();
+                       PreferencesUtil.setSearchConfigurator(configurator);
+                       PreferencesUtil.firePreferencesChanged(this.getClass());
+
                }
        }
 

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchOption.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchOption.java
index aae65543d0579f24f50b5bef30372a7b7c7d921b..11f1c0434ebc3b85bedb40d6c5a6385620960962 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchOption.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchOption.java
@@ -8,7 +8,6 @@
  */
 package eu.etaxonomy.taxeditor.navigation.search;
 
-import eu.etaxonomy.cdm.api.service.config.IFindTaxaAndNamesConfigurator;
 import eu.etaxonomy.taxeditor.navigation.l10n.Messages;
 import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
@@ -35,26 +34,26 @@ public enum SearchOption {
     }
 
     public boolean getPreference() {
-        if (!PreferencesUtil.getPreferenceStore().contains(IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_TAXA)) {
-            // initializes the search configurator
-            IFindTaxaAndNamesConfigurator configurator = PreferencesUtil.initializeSearchConfigurator();
-            PreferencesUtil.setSearchConfigurator(configurator);
-        }
+//        if (!PreferencesUtil.getPreferenceStore().contains(IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_TAXA)) {
+//            // initializes the search configurator
+//            IFindTaxaAndNamesConfigurator configurator = PreferencesUtil.initializeSearchConfigurator();
+//            PreferencesUtil.setSearchConfigurator(configurator);
+//        }
 
         switch (this) {
         case TAXON:
-            boolean result = PreferencesUtil.getPreferenceStore().getBoolean(
-                    IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_TAXA);
+            boolean result = PreferencesUtil.getPreferenceStore().contains(IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_TAXA)? PreferencesUtil.getPreferenceStore().getBoolean(
+                    IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_TAXA): true;
             return result;
         case SYNONYM:
-            return PreferencesUtil.getPreferenceStore().getBoolean(
-                    IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_SYNONYMS);
+            return  PreferencesUtil.getPreferenceStore().contains(IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_SYNONYMS)? PreferencesUtil.getPreferenceStore().getBoolean(
+                    IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_SYNONYMS): true;
         case NAME:
-            return PreferencesUtil.getPreferenceStore().getBoolean(
-                    IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_NAMES);
+            return PreferencesUtil.getPreferenceStore().contains(IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_NAMES)? PreferencesUtil.getPreferenceStore().getBoolean(
+                    IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_NAMES): true;
         case COMMON_NAME:
-            return PreferencesUtil.getPreferenceStore().getBoolean(
-                    IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_COMMON_NAMES);
+            return PreferencesUtil.getPreferenceStore().contains(IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_COMMON_NAMES)? PreferencesUtil.getPreferenceStore().getBoolean(
+                    IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_COMMON_NAMES): true;
         }
 
         return true;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
index ae525584fade3c9c3a9b82170cc3e2857c5fd797..c93921e7792b38cac3f8e01d7629e1c9d0dafc20 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
@@ -450,7 +450,7 @@ public class Messages extends NLS {
     public static String AbcdImportPreference_import_all_children_for_cultures_or_tissues;
     public static String AbcdImportPreference_import_all_children_for_cultures_or_tissues_tooltip;
     public static String AbcdImportPreference_map_unit_nr_catalog_number;
-    public static String AbcdImportPreference_map_unit_number_accession_number_tooltip;
+
     public static String AbcdImportPreference_map_unit_number_barcode;
     public static String AbcdImportPreference_map_unit_number_barcode_tooltip;
     public static String AbcdImportPreference_map_unit_number_catalog_number_tooltip;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
index 9db2dd81c7263793762ccd653a55c61ac0adfe36..941297dcc1196ef83980f5d427e6048f31a10a1b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
@@ -819,14 +819,14 @@ public class PreferencesUtil implements IPreferenceKeys {
     public static IFindTaxaAndNamesConfigurator getSearchConfigurator() {
         IFindTaxaAndNamesConfigurator configurator = initializeSearchConfigurator();
 
-        configurator.setDoTaxa(getPreferenceStore().getBoolean(
-                TAXON_SERVICE_CONFIGURATOR_TAXA));
-        configurator.setDoSynonyms(getPreferenceStore().getBoolean(
-                TAXON_SERVICE_CONFIGURATOR_SYNONYMS));
-        configurator.setDoNamesWithoutTaxa(getPreferenceStore().getBoolean(
-                TAXON_SERVICE_CONFIGURATOR_NAMES));
-        configurator.setDoTaxaByCommonNames(getPreferenceStore().getBoolean(
-                TAXON_SERVICE_CONFIGURATOR_COMMON_NAMES));
+        configurator.setDoTaxa(PreferencesUtil.getPreferenceStore().contains(IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_TAXA)? PreferencesUtil.getPreferenceStore().getBoolean(
+                IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_TAXA): true);
+        configurator.setDoSynonyms(PreferencesUtil.getPreferenceStore().contains(IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_SYNONYMS)? PreferencesUtil.getPreferenceStore().getBoolean(
+                IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_SYNONYMS): true);
+        configurator.setDoNamesWithoutTaxa(PreferencesUtil.getPreferenceStore().contains(IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_NAMES)? PreferencesUtil.getPreferenceStore().getBoolean(
+                IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_NAMES): true);
+        configurator.setDoTaxaByCommonNames(PreferencesUtil.getPreferenceStore().contains(IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_COMMON_NAMES)? PreferencesUtil.getPreferenceStore().getBoolean(
+                IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_COMMON_NAMES): true);
         //configurator.setMatchMode(eu.etaxonomy.cdm.persistence.query.MatchMode.valueOf(getStringValue(TAXON_SERVICE_CONFIGURATOR_MATCH_MODE)));
 
         return configurator;
@@ -905,9 +905,7 @@ public class PreferencesUtil implements IPreferenceKeys {
      * Set default values for preferences
      */
     public static void setDefaults() {
-        getPreferenceStore().setDefault(TAXON_SERVICE_CONFIGURATOR_TAXA, true);
-        getPreferenceStore().setDefault(TAXON_SERVICE_CONFIGURATOR_SYNONYMS,
-                true);
+
         getPreferenceStore().setDefault(createPreferenceString(EDIT_MAP_SERVICE_ACCES_POINT),
                 "http://edit.africamuseum.be/edit_wp5/v1.2/rest_gen.php");
         //FIXME : changed default for SHOULD_CONNECT_AT_STARTUP to false (ticket 3828) until resolution
@@ -921,11 +919,6 @@ public class PreferencesUtil implements IPreferenceKeys {
         getPreferenceStore().setDefault(TAXON_SERVICE_CONFIGURATOR_NAMES, true);
         getPreferenceStore().setDefault(TAXON_SERVICE_CONFIGURATOR_COMMON_NAMES, true);
 
-        //Distribution Editor:
-//      getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.DistributionEditorActivated.getKey()), Boolean.valueOf(PreferencePredicate.DistributionEditorActivated.getDefaultValue().toString()));
-//      getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()), PreferencePredicate.DisplayOfAreasInDistributionEditor.getDefaultValue().toString());
-//      getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.DisplayOfStatus.getKey()), PreferencePredicate.DisplayOfStatus.getDefaultValue().toString());
-
 
         //Name Details
         getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.NameDetailsView.getKey()), new NameDetailsConfigurator(false).toString());