From: Katja Luther <k.luther@bgbm.org>
Date: Wed, 4 Sep 2019 13:32:17 +0000 (+0200)
Subject: ref #8489: taxon node order preferences
X-Git-Tag: 5.9.2^2~8
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/43b350e859fc69b230f48e144c892a8bf01074d0

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 98c550e84..376e9ed34 100755
--- 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 4e4bc7690..3491b3db0 100644
--- 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() {
 		    if (isApply()){
     		    PreferencesUtil.setSortNodes(this.orderActivated);
-    		    //PreferencesUtil.setBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.TaxonNodeOrder), value);
+    		    if (orderActivated != null){
+    		        PreferencesUtil.setBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.TaxonNodeOrder.getKey()), true);
+    		    }else{
+    		        PreferencesUtil.setBooleanValue(PreferencesUtil.createOverridePreferenceString(PreferencePredicate.TaxonNodeOrder.getKey()), false);
+    		    }
     		    PreferencesUtil.setStoreNavigatorState(isRestoreTaxonNavigator);
     	    	MessageDialog.openInformation(getShell(), null, Messages.OrderPreferencePage_PleaseReopenNavigator);
 		    }
@@ -153,15 +157,10 @@ public class OrderPreferences extends CdmPreferencePage implements SelectionList
             }
 
             isRestoreTaxonNavigator = false;
-            orderActivated = NavigatorOrderEnum.RankAndNameOrder;
-            int index = 0;
-            for (String itemLabel : orderSelectionCombo.getItems()){
-                if (itemLabel.equalsIgnoreCase(orderActivated.getLabel())){
-                    orderSelectionCombo.select(index);
-                    break;
-                }
-                index++;
-            }
+            orderActivated = null;
+
+            orderSelectionCombo.select(0);
+
             super.performDefaults();
         }