correct handling of allowOverride in taxonnode admin preferences

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/TaxonNodeOrderAdminPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/TaxonNodeOrderAdminPreference.java
index 51e9d7962029b01a42299554a56dd2cc0ae25166..a61198c030bb95a0d4d0228df95c6f036e27c84e 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/TaxonNodeOrderAdminPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/TaxonNodeOrderAdminPreference.java
@@ -24,9 +24,12 @@ public class TaxonNodeOrderAdminPreference extends OrderPreferences {
     @Override
     public boolean performOk() {
         if (isApply()){
-            PreferencesUtil.setPreferenceToDB(CdmPreference.NewTaxEditorInstance(PreferencePredicate.TaxonNodeOrder, this.orderActivated!=null?this.orderActivated.getKey():null));
-           // MessageDialog.openInformation(getShell(), null, Messages.OrderPreferencePage_PleaseReopenNavigator);
-            PreferencesUtil.setPreferenceToDB(CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowTaxonNodeWizard, isShowTaxonNodeWizard != null? Boolean.toString(this.isShowTaxonNodeWizard): null));
+            orderPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.TaxonNodeOrder, this.orderActivated!=null?this.orderActivated.getKey():null);
+            orderPref.setAllowOverride(allowOverride);
+            PreferencesUtil.setPreferenceToDB(orderPref);
+            nodePref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowTaxonNodeWizard, isShowTaxonNodeWizard != null? Boolean.toString(this.isShowTaxonNodeWizard): null);
+            nodePref.setAllowOverride(isAllowOverrideShowTaxonNodeWizard);
+            PreferencesUtil.setPreferenceToDB(nodePref);
             setApply(false);
         }
         return true;
@@ -44,7 +47,7 @@ public class TaxonNodeOrderAdminPreference extends OrderPreferences {
             orderPref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.TaxonNodeOrder, null);
         }
         orderActivated = orderPref.getValue() != null?NavigatorOrderEnum.valueOf(orderPref.getValue()): null;
-        isShowTaxonNodeWizard = nodePref != null? (nodePref.getValue()!= null? Boolean.valueOf(nodePref.getValue()): null): null;
+        isShowTaxonNodeWizard = getBooleanPrefValue(nodePref);
     }