ref #7849: fix problems with nomenclatural code preference continue

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 db043eaffbbe52aa96760c69cc539eed1cb5a3ef..41750af91a5b612d4fb75bb20ca4d039e5e20981 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
@@ -467,6 +467,9 @@ public class PreferencesUtil implements IPreferenceKeys {
            }else{
                preferredCode = pref.getValue();
            }
+           if (StringUtils.isBlank(preferredCode)){
+               preferredCode = getPreferenceKey((NomenclaturalCode)PreferencePredicate.NomenclaturalCode.getDefaultValue());
+           }
 
            return getPreferredNomenclaturalCode(preferredCode);
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NomenclaturalCodePreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NomenclaturalCodePreferences.java
index b869457d3e83b0cac75cbcfe605136147954b277..e6d2bdce633f7e48f1753fabb644159081b41e1e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NomenclaturalCodePreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/NomenclaturalCodePreferences.java
@@ -45,7 +45,7 @@ public class NomenclaturalCodePreferences extends FieldEditorPreferencePageE4 {
                                getFieldEditorParent()));
 
             addField(new BooleanFieldEditor(
-                    PreferencesUtil.createOverridePreferenceString(PreferencePredicate.NomenclaturalCode.getKey()),
+                    PreferencesUtil.createPreferenceString(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.NomenclaturalCode.getKey())),
                     Messages.NomenclaturalCodePreferences_useLocalCode,
                     getFieldEditorParent()));
         } else {