ref #7849: correct enabling of local prefs with no allowOverride and sortOrder for...

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / databaseAdmin / preferencePage / ChecklistEditorGeneralAdminPreference.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralAdminPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralAdminPreference.java
index 3de87f419c00a1aa1b928e774854fcf85deda546..e4045d842cc8bb9a106b1c25cfb16f2a9f8ed35c 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralAdminPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralAdminPreference.java
@@ -60,7 +60,7 @@ public class ChecklistEditorGeneralAdminPreference extends ChecklistEditorGenera
         pref.setAllowOverride(this.allowOverrideRank);
         service.set(pref);
 
-        pref = CdmPreference.NewTaxEditorInstance( EditorPreferencePredicate.AreasSortedByIdInVocabulary, Boolean.toString(isSortByVocabularyOrder));
+        pref = CdmPreference.NewTaxEditorInstance( EditorPreferencePredicate.AreasSortedInDistributionEditor, this.orderAreas);
         pref.setAllowOverride(this.allowOverrideOrderAreas);
         service.set(pref);
 
@@ -102,12 +102,12 @@ public class ChecklistEditorGeneralAdminPreference extends ChecklistEditorGenera
             this.allowOverrideStatusDisplay = true;
         }
 
-        pref = PreferencesUtil.getPreferenceFromDB(EditorPreferencePredicate.AreasSortedByIdInVocabulary);
+        pref = PreferencesUtil.getPreferenceFromDB(EditorPreferencePredicate.AreasSortedInDistributionEditor);
         if (pref != null){
-            this.isSortByVocabularyOrder = Boolean.valueOf(pref.getValue().toString());
+            this.orderAreas = pref.getValue().toString();
             this.allowOverrideOrderAreas = pref.isAllowOverride();
         }else{
-            this.isSortByVocabularyOrder = Boolean.valueOf(EditorPreferencePredicate.AreasSortedByIdInVocabulary.getDefaultValue().toString());
+            this.orderAreas = EditorPreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue().toString();
             this.allowOverrideOrderAreas = true;
         }