set default for search options if not existing

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 bf07632c04a6718e8db0cf1f1bac5a4ef3ca1c4d..aae65543d0579f24f50b5bef30372a7b7c7d921b 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,6 +8,7 @@
  */
 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;
@@ -36,7 +37,8 @@ public enum SearchOption {
     public boolean getPreference() {
         if (!PreferencesUtil.getPreferenceStore().contains(IPreferenceKeys.TAXON_SERVICE_CONFIGURATOR_TAXA)) {
             // initializes the search configurator
-            PreferencesUtil.initializeSearchConfigurator();
+            IFindTaxaAndNamesConfigurator configurator = PreferencesUtil.initializeSearchConfigurator();
+            PreferencesUtil.setSearchConfigurator(configurator);
         }
 
         switch (this) {

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 2b7d2dd337952d6911235b7cab1330325ef4048e..ca85e91cc5bbfca6fc6ab6c6ced83476e5888405 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
@@ -908,10 +908,10 @@ public class PreferencesUtil implements IPreferenceKeys {
                                "http://www.biodiversitylibrary.org/openurl");
                getPreferenceStore().setDefault(createPreferenceString(OPENURL_IMAGE_MAX_WIDTH), "1000");
                getPreferenceStore().setDefault(createPreferenceString(OPENURL_IMAGE_MAX_HEIGHT), "1000");
-               getPreferenceStore().setDefault(createPreferenceString(TAXON_SERVICE_CONFIGURATOR_TAXA), true);
-               getPreferenceStore().setDefault(createPreferenceString(TAXON_SERVICE_CONFIGURATOR_SYNONYMS), true);
-               getPreferenceStore().setDefault(createPreferenceString(TAXON_SERVICE_CONFIGURATOR_NAMES), true);
-               getPreferenceStore().setDefault(createPreferenceString(TAXON_SERVICE_CONFIGURATOR_COMMON_NAMES), true);
+               getPreferenceStore().setDefault(TAXON_SERVICE_CONFIGURATOR_TAXA, true);
+               getPreferenceStore().setDefault(TAXON_SERVICE_CONFIGURATOR_SYNONYMS, true);
+               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()));