ref #8489: taxon node order 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 98c550e846bc36133a941e6a4606faa80a93aded..376e9ed346d0af64928aae9a2f6f7716a76ddeef 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
@@ -27,7 +27,7 @@ public class TaxonNodeOrderAdminPreference extends OrderPreferences {
     @Override
     public boolean performOk() {
         if (isApply()){
-            PreferencesUtil.setPreferenceToDB(CdmPreference.NewTaxEditorInstance(PreferencePredicate.TaxonNodeOrder, this.orderActivated.getKey()));
+            PreferencesUtil.setPreferenceToDB(CdmPreference.NewTaxEditorInstance(PreferencePredicate.TaxonNodeOrder, this.orderActivated!=null?this.orderActivated.getKey():null));
             MessageDialog.openInformation(getShell(), null, Messages.OrderPreferencePage_PleaseReopenNavigator);
             setApply(false);
         }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/OrderPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/OrderPreferences.java
index 4e4bc76901603a54f4e2760b6dfc9957b7cffc0f..3491b3db0687b8b5a07d4e8770517948d5ec4f7f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/OrderPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/OrderPreferences.java
@@ -110,7 +110,11 @@ public class OrderPreferences extends CdmPreferencePage implements SelectionList
                public boolean performOk() {\r
                    if (isApply()){\r
                    PreferencesUtil.setSortNodes(this.orderActivated);\r
-                   //PreferencesUtil.setBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.TaxonNodeOrder), value);\r
+                   if (orderActivated != null){\r
+                       PreferencesUtil.setBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.TaxonNodeOrder.getKey()), true);\r
+                   }else{\r
+                       PreferencesUtil.setBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.TaxonNodeOrder.getKey()), false);\r
+                   }\r
                    PreferencesUtil.setStoreNavigatorState(isRestoreTaxonNavigator);\r
                MessageDialog.openInformation(getShell(), null, Messages.OrderPreferencePage_PleaseReopenNavigator);\r
                    }\r
@@ -153,15 +157,10 @@ public class OrderPreferences extends CdmPreferencePage implements SelectionList
             }\r
 \r
             isRestoreTaxonNavigator = false;\r
-            orderActivated = NavigatorOrderEnum.RankAndNameOrder;\r
-            int index = 0;\r
-            for (String itemLabel : orderSelectionCombo.getItems()){\r
-                if (itemLabel.equalsIgnoreCase(orderActivated.getLabel())){\r
-                    orderSelectionCombo.select(index);\r
-                    break;\r
-                }\r
-                index++;\r
-            }\r
+            orderActivated = null;\r
+\r
+            orderSelectionCombo.select(0);\r
+\r
             super.performDefaults();\r
         }\r
 \r