ref #8385: fixes in preferences - getDefaults() for all pages

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 f34201b7c19fa523af968c7a134c899bd112d6cf..ed23fea1f80a262857c96aab69533647440acd35 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
@@ -56,7 +56,7 @@ public class ChecklistEditorGeneralAdminPreference extends ChecklistEditorGenera
             pref.setAllowOverride(allowOverrideActivatedButton.getSelection());
             service.set(pref);
         }
-        if(displayArea.equals(Messages.Preference_Use_Default)){
+        if(displayArea == null){
             service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.DisplayOfAreasInDistributionEditor));
         }else{
             pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.DisplayOfAreasInDistributionEditor, this.displayArea);
@@ -64,7 +64,7 @@ public class ChecklistEditorGeneralAdminPreference extends ChecklistEditorGenera
             service.set(pref);
         }
 
-        if (displayStatus.equals(Messages.Preference_Use_Default)){
+        if (displayStatus.startsWith(Messages.Preference_Use_Default)){
             service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.DisplayOfStatus));
         }else{
             pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.DisplayOfStatus, this.displayStatus);
@@ -79,7 +79,7 @@ public class ChecklistEditorGeneralAdminPreference extends ChecklistEditorGenera
             pref.setAllowOverride(allowOverrideRankButton.getSelection());
             service.set(pref);
         }
-        if (orderAreas.equals(Messages.Preference_Use_Default)){
+        if (orderAreas.startsWith(Messages.Preference_Use_Default)){
             service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AreasSortedInDistributionEditor));
         }else{
             pref = CdmPreference.NewTaxEditorInstance( PreferencePredicate.AreasSortedInDistributionEditor, this.orderAreas);
@@ -106,9 +106,11 @@ public class ChecklistEditorGeneralAdminPreference extends ChecklistEditorGenera
     @Override
     public void getValues() {
         super.getValues();
-        //distributionEditorPref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DistributionEditorActivated);
+        distributionEditorPref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.DistributionEditorActivated);
         if (distributionEditorPref != null){
             isEditorActivated = Boolean.valueOf(distributionEditorPref.getValue());
+        }else{
+            isEditorActivated = null;
         }
 
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java
index c5b08b2e146b83733a66f4687bdd8876d37bf9fd..fa9cc858fcc0cd19d0d8808766226fcf86115616 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/GeneralAdminPreferencePage.java
@@ -40,19 +40,30 @@ public class GeneralAdminPreferencePage extends GeneralPreferencePage implements
         }
        if (controller != null){
            IPreferenceService service = controller.getPreferenceService();
-
-           CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowImportExportMenu, Boolean.toString(this.isShowIOMenu));
-           pref.setAllowOverride(isAllowOverrideShowIOMenu);
-           service.set(pref);
-//           pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowMediaView, Boolean.toString(this.isShowMediaView));
-//           pref.setAllowOverride(isAllowOverrideShowMediaView);
-//           service.set(pref);
-           pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowChecklistPerspective, Boolean.toString(this.isShowCheckListPerspective));
-           pref.setAllowOverride(isAllowOverrideShowCheckListPerspective);
-           service.set(pref);
-           pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowTaxonNodeWizard, Boolean.toString(this.isShowTaxonNodeWizard));
-           pref.setAllowOverride(isAllowOverrideShowTaxonNodeWizard);
-           service.set(pref);
+           CdmPreference pref;
+           if (isShowIOMenu == null){
+               service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowImportExportMenu));
+           }else{
+               pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowImportExportMenu, Boolean.toString(this.isShowIOMenu));
+               pref.setAllowOverride(isAllowOverrideShowIOMenu);
+               service.set(pref);
+           }
+
+           if(isShowCheckListPerspective == null){
+               service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowChecklistPerspective));
+           }else{
+               pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowChecklistPerspective, Boolean.toString(this.isShowCheckListPerspective));
+               pref.setAllowOverride(isAllowOverrideShowCheckListPerspective);
+               service.set(pref);
+           }
+
+           if(isShowCheckListPerspective == null){
+               service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowTaxonNodeWizard));
+           }else{
+               pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowTaxonNodeWizard, Boolean.toString(this.isShowTaxonNodeWizard));
+               pref.setAllowOverride(isAllowOverrideShowTaxonNodeWizard);
+               service.set(pref);
+           }
            PreferencesUtil.updateDBPreferences();
 
 
@@ -72,7 +83,7 @@ public class GeneralAdminPreferencePage extends GeneralPreferencePage implements
               isShowIOMenu = Boolean.valueOf(pref.getValue());
               isAllowOverrideShowIOMenu = pref.isAllowOverride();
           }else{
-              isShowIOMenu = Boolean.valueOf(PreferencePredicate.ShowImportExportMenu.getDefaultValue().toString());
+              isShowIOMenu = null;
               isAllowOverrideShowIOMenu = true;
           }
 
@@ -92,7 +103,7 @@ public class GeneralAdminPreferencePage extends GeneralPreferencePage implements
               isShowCheckListPerspective = Boolean.valueOf(pref.getValue());
               isAllowOverrideShowCheckListPerspective = pref.isAllowOverride();
           }else{
-              isShowCheckListPerspective = Boolean.valueOf(PreferencePredicate.ShowChecklistPerspective.getDefaultValue().toString());
+              isShowCheckListPerspective = null;
               isAllowOverrideShowCheckListPerspective = true;
           }
 
@@ -102,7 +113,7 @@ public class GeneralAdminPreferencePage extends GeneralPreferencePage implements
               isShowTaxonNodeWizard = Boolean.valueOf(pref.getValue());
               isAllowOverrideShowTaxonNodeWizard = pref.isAllowOverride();
           }else{
-              isShowTaxonNodeWizard = Boolean.valueOf(PreferencePredicate.ShowTaxonNodeWizard.getDefaultValue().toString());
+              isShowTaxonNodeWizard = null;
               isAllowOverrideShowTaxonNodeWizard = true;
           }
       }
@@ -111,25 +122,15 @@ public class GeneralAdminPreferencePage extends GeneralPreferencePage implements
 
     @Override
     protected void performDefaults() {
-        isShowIOMenu = Boolean.valueOf(PreferencePredicate.ShowImportExportMenu.getDefaultValue().toString());
-        if (isShowIOMenu){
-            showIOMenuButton.select(0);
-        }else{
-            showIOMenuButton.select(1);
-        }
-        isShowCheckListPerspective = Boolean.valueOf(PreferencePredicate.ShowChecklistPerspective.getDefaultValue().toString());
-        if (isShowCheckListPerspective){
-            showChecklistPerspectiveButton.select(0);
-        }else{
-            showChecklistPerspectiveButton.select(1);
-        }
+        isShowIOMenu = null;
+        showIOMenuButton.select(0);
 
-        isShowTaxonNodeWizard = Boolean.valueOf(PreferencePredicate.ShowTaxonNodeWizard.getDefaultValue().toString());
-        if (isShowTaxonNodeWizard){
-            showTaxonNodeWizardButton.select(0);
-        }else{
-            showTaxonNodeWizardButton.select(1);
-        }
+        isShowCheckListPerspective = null;
+        showChecklistPerspectiveButton.select(0);
+
+
+        isShowTaxonNodeWizard = null;
+        showTaxonNodeWizardButton.select(0);
 
         isAllowOverrideShowIOMenu = true;
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameDetailsViewAdminConfiguration.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameDetailsViewAdminConfiguration.java
index f1ff82299b010e6ddc46791a31fe31f4be391d87..20e88e900fe9700ed8bbb6331a61cc340028680c 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameDetailsViewAdminConfiguration.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/NameDetailsViewAdminConfiguration.java
@@ -17,7 +17,8 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 public class NameDetailsViewAdminConfiguration extends NameDetailsViewConfiguration implements IE4AdminPreferencePage{
 
    protected NameDetailsConfigurator createNameDetailsViewConfig() {
-       NameDetailsConfigurator config = new NameDetailsConfigurator(isSimpleDetailsViewActivated);
+
+       NameDetailsConfigurator config = new NameDetailsConfigurator(isSimpleDetailsViewActivated!= null? isSimpleDetailsViewActivated:false);
 
       config.setAppendedPhraseActivated(isShowAppendedPhrase);
       config.setAtomisedEpithetsActivated(isShowEpithets);
@@ -59,9 +60,10 @@ public class NameDetailsViewAdminConfiguration extends NameDetailsViewConfigurat
         NameDetailsConfigurator config = createNameDetailsViewConfig();
         String value = config.toString();
 
-        if (config.isAllowOverride() && !config.isSimpleDetailsViewActivated()){
-            // is default, should delete from db
-            value = null;
+        if (isSimpleDetailsViewActivated == null){
+            service.remove(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.NameDetailsView));
+
+            return true;
         }
         CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.NameDetailsView, value);
         pref.setAllowOverride(isAllowOverride);
@@ -92,9 +94,7 @@ public class NameDetailsViewAdminConfiguration extends NameDetailsViewConfigurat
 
         }
         nameDetailsConfig = PreferencesUtil.getPreferredNameDetailsConfiguration(false);
-        if (nameDetailsConfig == null){
-            nameDetailsConfig = new NameDetailsConfigurator(false);
-        }
+
 
     }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/PublishFlagPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/PublishFlagPreference.java
index fb84c1c478bcf51566f674d2a053e9525989065d..4109584235f74a5c601c00db4fc5dcca2b85645e 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/PublishFlagPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/PublishFlagPreference.java
@@ -47,7 +47,7 @@ public class PublishFlagPreference extends PublishFlagLocalPreference implements
         IPreferenceService service = controller.getPreferenceService();
         String text = publishFlagBehaviour.getText();
         // default -> delete preference
-        if(text.equals(Messages.Preference_Use_Default)){
+        if(text.startsWith(Messages.Preference_Use_Default)){
             service.remove(pref.getKey());
             PreferencesUtil.updateDBPreferences();
             return true;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/RankAdminPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/RankAdminPreference.java
index 098d18ea02bfdbd77068a6dbcae892aa9297256b..04212e9825aa0f3a4bba5a43a4ee9604804fdcb1 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/RankAdminPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/RankAdminPreference.java
@@ -44,6 +44,12 @@ public class RankAdminPreference extends RankPreference {
         if (!isApply()){
             return true;
         }
+        if (pref == null){
+            PreferencesUtil.setPreferenceToDB(CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableRanks, null));
+            PreferencesUtil.updateDBPreferences();
+            PreferencesUtil.firePreferencesChanged(this.getClass());
+            return true;
+        }
         Object[] checkedElements = treeComposite.getViewer().getCheckedElements();
         List<UUID> listUIIDChecked = new ArrayList<>();
         List<DefinedTermBase> preferredTerms = new ArrayList<>();

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
index 19054ba158e0877069dd22ffa4044cdfdc9a920c..4b9ecf3439bb708427eb2f282e11090d36300fa5 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java
@@ -84,8 +84,8 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
 \r
     protected Combo activateRankCombo;\r
     protected Button allowOverrideRankButton;\r
-    final String SHOW_RANK = "Show Rank";\r
-    final String NO_RANK = "No Rank";\r
+    final String SHOW_RANK = "Yes";\r
+    final String NO_RANK = "No";\r
 \r
 \r
 \r
@@ -416,7 +416,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
 \r
 \r
             override = false;\r
-            if (!orderAreas.equals(Messages.Preference_Use_Default) ) {\r
+            if (!orderAreas.startsWith(Messages.Preference_Use_Default) ) {\r
                 override = true;\r
                 PreferencesUtil.setSortNamedAreasInDistributionEditor(orderAreas);\r
             }\r
@@ -439,7 +439,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
 \r
 \r
             override = false;\r
-            if (!displayStatus.equals(Messages.Preference_Use_Default)) {\r
+            if (!displayStatus.startsWith(Messages.Preference_Use_Default)) {\r
                override = true;\r
                PreferencesUtil.setDisplayStatusInChecklistEditor(displayStatus);\r
             }\r
@@ -448,7 +448,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
                     override);\r
 \r
             override = false;\r
-            if (!displayStatusCombo.equals(Messages.Preference_Use_Default)) {\r
+            if (!displayStatusCombo.startsWith(Messages.Preference_Use_Default)) {\r
                override = true;\r
                PreferencesUtil.setStringValue(PreferencePredicate.DisplayOfStatusInCombo.getKey(), displayStatusCombo);\r
             }\r
@@ -459,7 +459,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
 \r
 \r
             override = false;\r
-            if (!displayArea.equals(Messages.Preference_Use_Default) ) {\r
+            if (!displayArea.startsWith(Messages.Preference_Use_Default) ) {\r
                 override = true;\r
                 PreferencesUtil.setAreaDisplayInChecklistEditor(displayArea);\r
             }\r
@@ -487,7 +487,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
         setApply(true);\r
         if (e.getSource().equals(statusDisplaySelectionCombo)) {\r
             String text = statusDisplaySelectionCombo.getText();\r
-            if(text.equals(Messages.Preference_Use_Default)){\r
+            if(text.startsWith(Messages.Preference_Use_Default)){\r
                 displayStatus = Messages.Preference_Use_Default;\r
                 if(isAdminPreference){\r
                     prefStatusDisplay.setAllowOverride(true);\r
@@ -506,8 +506,8 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
         }\r
         if (e.getSource().equals(statusDisplayInComboSelectionCombo)) {\r
             String text = statusDisplayInComboSelectionCombo.getText();\r
-            if(text.equals(Messages.Preference_Use_Default)){\r
-                displayStatusCombo = Messages.Preference_Use_Default;\r
+            if(text.startsWith(Messages.Preference_Use_Default)){\r
+                displayStatusCombo = null;\r
                 if(isAdminPreference){\r
                     prefStatusDisplayInCombo.setAllowOverride(true);\r
                     allowOverrideStatusDisplayInComboButton.setSelection(true);\r
@@ -525,8 +525,8 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
         }\r
         if (e.getSource().equals(areaDisplaySelectionCombo)) {\r
             String text = areaDisplaySelectionCombo.getText();\r
-            if(text.equals(Messages.Preference_Use_Default)){\r
-                displayArea = Messages.Preference_Use_Default;\r
+            if(text.startsWith(Messages.Preference_Use_Default)){\r
+                displayArea = null;\r
                 if (isAdminPreference){\r
                     prefAreaDisplay.setAllowOverride(true);\r
                     allowOverrideAreaDisplayButton.setSelection(true);\r
@@ -542,7 +542,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
         }\r
         if (e.getSource().equals(areaOrderSelectionCombo)) {\r
             String text = areaOrderSelectionCombo.getText();\r
-            if(text.equals(Messages.Preference_Use_Default)){\r
+            if(text.startsWith(Messages.Preference_Use_Default)){\r
                 orderAreas = Messages.Preference_Use_Default;\r
                 if (isAdminPreference){\r
                     prefAreaSort.setAllowOverride(true);\r
@@ -559,7 +559,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
         }\r
         if (e.getSource().equals(this.activateRankCombo)) {\r
             String text = activateRankCombo.getText();\r
-            if(text.equals(Messages.Preference_Use_Default)){\r
+            if(text.startsWith(Messages.Preference_Use_Default)){\r
                 isShowRank = null;\r
                 if (isAdminPreference){\r
                     prefRank.setAllowOverride(true);\r
@@ -576,7 +576,7 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
 \r
         if (e.getSource().equals(this.activateCombo)) {\r
             String text = activateCombo.getText();\r
-            if(text.equals(Messages.Preference_Use_Default)){\r
+            if(text.startsWith(Messages.Preference_Use_Default)){\r
                 isEditorActivated = null;\r
                 if (isAdminPreference){\r
                     if (distributionEditorPref == null){\r
@@ -785,87 +785,50 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
 \r
     @Override\r
     protected void performDefaults() {\r
-        if (isAdminPreference){\r
-            isEditorActivated = (Boolean) PreferencePredicate.DistributionEditorActivated.getDefaultValue();\r
-        }else{\r
-            isEditorActivated = Boolean.parseBoolean(distributionEditorPref.getValue().toString());\r
-        }\r
-        if (isEditorActivated) {\r
+        setApply(true);\r
+\r
+        isEditorActivated = null;\r
+\r
+        if (isEditorActivated == null) {\r
             activateCombo.select(0);\r
-        } else {\r
+        } else if (isEditorActivated){\r
             activateCombo.select(1);\r
+        } else{\r
+            activateCombo.select(2);\r
         }\r
 \r
-        if (isAdminPreference){\r
-            displayArea = ((TermDisplayEnum) PreferencePredicate.DisplayOfAreasInDistributionEditor.getDefaultValue())\r
-                    .getKey();\r
-        }else{\r
-            displayArea = prefAreaDisplay.getValue().toString();\r
-        }\r
+        displayArea = Messages.Preference_Use_Default;\r
 \r
-        TermDisplayEnum areaDisplay;\r
-        try {\r
-            if (displayArea != null) {\r
-                areaDisplay = TermDisplayEnum.byKey(displayArea);\r
-            } else {\r
-                areaDisplay = TermDisplayEnum.Title;\r
-            }\r
-        } catch (IllegalArgumentException e) {\r
-            areaDisplay = TermDisplayEnum.Title;\r
-        }\r
         int index = 0;\r
         for (String itemLabel : areaDisplaySelectionCombo.getItems()) {\r
-            if (itemLabel.equalsIgnoreCase(areaDisplay.getLabel())) {\r
+            if (itemLabel.equalsIgnoreCase(Messages.Preference_Use_Default)) {\r
                 areaDisplaySelectionCombo.select(index);\r
                 break;\r
             }\r
             index++;\r
         }\r
 \r
-        if (isAdminPreference){\r
-            displayStatus = ((TermDisplayEnum) PreferencePredicate.DisplayOfStatus.getDefaultValue()).getKey();\r
-        }else{\r
-            displayStatus = prefStatusDisplay.getValue().toString();\r
-        }\r
+        displayStatus = Messages.Preference_Use_Default;\r
+\r
+\r
 \r
-        TermDisplayEnum statusDisplay;\r
-        try {\r
-            if (displayStatus != null) {\r
-                statusDisplay = TermDisplayEnum.byKey(displayStatus);\r
-            } else {\r
-                statusDisplay = TermDisplayEnum.Title;\r
-            }\r
-        } catch (IllegalArgumentException e) {\r
-            statusDisplay = TermDisplayEnum.Title;\r
-        }\r
         index = 0;\r
         for (String itemLabel : statusDisplaySelectionCombo.getItems()) {\r
-            if (itemLabel.equalsIgnoreCase(statusDisplay.getLabel())) {\r
+            if (itemLabel.equalsIgnoreCase(displayStatus)) {\r
                 statusDisplaySelectionCombo.select(index);\r
                 break;\r
             }\r
             index++;\r
         }\r
-        if (isAdminPreference){\r
-            orderAreas = ((TermOrder) PreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue()).getKey();\r
-        }else{\r
-            orderAreas = prefAreaSort.getValue().toString();\r
-        }\r
+\r
+        orderAreas = Messages.Preference_Use_Default;\r
+\r
 \r
         index = 0;\r
         if (PreferencesUtil.getStringValue(PreferencePredicate.DistributionEditorActivated.getKey()) != null) {\r
-            TermOrder areaOrder;\r
-            try {\r
-                if (orderAreas != null) {\r
-                    areaOrder = TermOrder.valueOf(orderAreas);\r
-                } else {\r
-                    areaOrder = TermOrder.IdInVoc;\r
-                }\r
-            } catch (IllegalArgumentException e) {\r
-                areaOrder = TermOrder.IdInVoc;\r
-            }\r
+\r
             for (String itemLabel : areaOrderSelectionCombo.getItems()) {\r
-                if (itemLabel.equalsIgnoreCase(areaOrder.getLabel())) {\r
+                if (itemLabel.equalsIgnoreCase(orderAreas)) {\r
                     areaOrderSelectionCombo.select(index);\r
                     break;\r
                 }\r
@@ -873,16 +836,26 @@ public class ChecklistEditorGeneralPreference extends CdmPreferencePage implemen
             }\r
         }\r
 \r
-        if (isAdminPreference){\r
-            isShowRank = Boolean.valueOf(PreferencePredicate.ShowRankInDistributionEditor.getDefaultValue().toString());\r
-        }else{\r
-            isShowRank = Boolean.parseBoolean(prefRank.getValue().toString());\r
+\r
+        isShowRank = null;\r
+\r
+        index = 0;\r
+        for (String itemLabel : activateRankCombo.getItems()) {\r
+            if (itemLabel.equalsIgnoreCase(Messages.Preference_Use_Default)) {\r
+                activateRankCombo.select(index);\r
+                break;\r
+            }\r
+            index++;\r
         }\r
 \r
-        if (isShowRank) {\r
-            activateRankCombo.select(0);\r
-        } else {\r
-            activateRankCombo.select(1);\r
+        displayStatusCombo = null;\r
+        index = 0;\r
+        for (String itemLabel : statusDisplayInComboSelectionCombo.getItems()) {\r
+            if (itemLabel.equalsIgnoreCase(Messages.Preference_Use_Default)) {\r
+                statusDisplayInComboSelectionCombo.select(index);\r
+                break;\r
+            }\r
+            index++;\r
         }\r
 \r
         ownDescriptionForDistributionEditor = Boolean\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java
index b92fde73900db39c0379d7d113ca5cc167b6069d..43d5d0769629d4349da36003507a5bc38b59b64f 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralPreferencePage.java
@@ -233,10 +233,9 @@ public class GeneralPreferencePage extends CdmPreferencePage implements Selectio
     public void widgetSelected(SelectionEvent e) {
         if (e.getSource().equals(this.showIOMenuButton)) {
             String text = showIOMenuButton.getText();
-            if (text.equals(Messages.Preference_Use_Default)){
-                isOverrideShowIOMenu = false;
-            }else{
+            if (text.startsWith(Messages.Preference_Use_Default)){
                 isOverrideShowIOMenu = true;
+                isShowIOMenu = null;
             }
             if (text.equals(SHOW)){
                 isShowIOMenu = true;
@@ -246,10 +245,9 @@ public class GeneralPreferencePage extends CdmPreferencePage implements Selectio
         }
         if (e.getSource().equals(this.showChecklistPerspectiveButton)) {
             String text = showChecklistPerspectiveButton.getText();
-            if (text.equals(Messages.Preference_Use_Default)){
-                isOverrideShowCheckListPerspective = false;
-            }else{
+            if (text.startsWith(Messages.Preference_Use_Default)){
                 isOverrideShowCheckListPerspective = true;
+                isShowCheckListPerspective = null;
             }
             if (text.equals(SHOW)){
                 isShowCheckListPerspective = true;
@@ -259,10 +257,9 @@ public class GeneralPreferencePage extends CdmPreferencePage implements Selectio
         }
         if (e.getSource().equals(this.showTaxonNodeWizardButton)) {
             String text = showTaxonNodeWizardButton.getText();
-            if (text.equals(Messages.Preference_Use_Default)){
-                isOverrideShowTaxonNodeWizard = false;
-            }else{
+            if (text.startsWith(Messages.Preference_Use_Default)){
                 isOverrideShowTaxonNodeWizard = true;
+                isShowTaxonNodeWizard = null;
             }
             if (text.equals(SHOW)){
                 isShowTaxonNodeWizard = true;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralTermPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralTermPreference.java
index ec90080a4248023499209de4ee7adf02c8aefa72..1a6eb19e155a1c3050c828e2adac4b60016c918c 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralTermPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/GeneralTermPreference.java
@@ -150,7 +150,7 @@ abstract public class GeneralTermPreference extends CdmPreferencePage implements
 
     }
 
-    protected String getCheckedValuesFromPreferences(){
+    public String getCheckedValuesFromPreferences(){
         String values;
         if (localPref){
             values = PreferencesUtil.getStringValue(predicate.getKey(), this.localPref);
@@ -181,6 +181,7 @@ abstract public class GeneralTermPreference extends CdmPreferencePage implements
         }else{
             List<AbstractTermDto> termsFromStringValues = getTermsFromStringValues(new ArrayList<String>());
             treeComposite.setCheckedElements(termsFromStringValues.toArray());
+            pref = null;
         }
     }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java
index ce637fa44b0a564f295bae81abc5b0abe71dca18..c51a06cf9642916fe0e10f2f8b0d1a35dc6e0ea5 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NameDetailsViewConfiguration.java
@@ -93,9 +93,7 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage implements S
 
             Composite title  = createComposite(parent);
 //            nameDetailsConfig = PreferencesUtil.getPreferredNameDetailsConfiguration(!isAdminPreference);
-            if (nameDetailsConfig == null){
-                nameDetailsConfig = new NameDetailsConfigurator(false);
-            }
+//
 
             activateCheckButton = createBooleanCombo(title, ENABLE, DISABLE, PreferencePredicate.SimpleDetailsViewActivated, Messages.NameDetailsViewConfiguration_activateSimpleDetailsView, isAdminPreference);
             if (isAdminPreference){
@@ -119,8 +117,12 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage implements S
 
 //            activateCheckButton.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, true, 1, 1));
 //            activateCheckButton.setText(Messages.NameDetailsViewConfiguration_activateSimpleDetailsView);
-            isSimpleDetailsViewActivated = nameDetailsConfig.isSimpleDetailsViewActivated();
-
+            if (nameDetailsConfig != null){
+                isSimpleDetailsViewActivated = nameDetailsConfig.isSimpleDetailsViewActivated();
+            }
+            if (nameDetailsConfig == null){
+              nameDetailsConfig = new NameDetailsConfigurator(false);
+            }
             activateCheckButton.addSelectionListener(this);
 //            new SelectionAdapter(){
 //                @Override
@@ -140,7 +142,11 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage implements S
 
 
             dbSettings.setLayout(new GridLayout());
-            dbSettings.setEnabled(isSimpleDetailsViewActivated);
+            if (isSimpleDetailsViewActivated != null){
+                dbSettings.setEnabled(isSimpleDetailsViewActivated);
+            }else{
+                dbSettings.setEnabled(false);
+            }
 
 
             Label separator= new Label(dbSettings, SWT.HORIZONTAL | SWT.SEPARATOR);
@@ -155,7 +161,7 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage implements S
                      setApply(true);
                      isShowTaxon = showTaxon.getSelection();
                      nameDetailsConfig.setTaxonSectionActivated(isShowTaxon);
-                     if (isSimpleDetailsViewActivated){
+                     if (isSimpleDetailsViewActivated!= null? isSimpleDetailsViewActivated:false){
                          showSecDetail.setEnabled(isShowTaxon);
                          secEnabled.setEnabled(isShowTaxon);
                      }
@@ -390,10 +396,13 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage implements S
                      nameDetailsConfig.setNameApprobiationActivated(isShowNameApprobiation);
                   }
              });
-            PreferencesUtil.recursiveSetEnabled(dbSettings, isSimpleDetailsViewActivated);
-            if (isSimpleDetailsViewActivated){
+            PreferencesUtil.recursiveSetEnabled(dbSettings, isSimpleDetailsViewActivated!= null? isSimpleDetailsViewActivated:false);
+            if (isSimpleDetailsViewActivated!= null? isSimpleDetailsViewActivated:false){
                 showSecDetail.setEnabled(isShowTaxon);
                 secEnabled.setEnabled(isShowTaxon);
+            }else{
+                showSecDetail.setEnabled(false);
+                secEnabled.setEnabled(false);
             }
             setButtonSelections();
 
@@ -495,8 +504,9 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage implements S
         isSecEnabled = nameDetailsConfig.isSecEnabled();
         isShowTypeDesignation = nameDetailsConfig.isTypeDesignationSectionActivated();
         isShowHybrid = nameDetailsConfig.isHybridActivated();
-        isSimpleDetailsViewActivated = false;
+        isSimpleDetailsViewActivated = null;
         this.setButtonSelections();
+       // activateCheckButton.select(0);
         super.performDefaults();
     }
 
@@ -505,9 +515,10 @@ public class NameDetailsViewConfiguration extends CdmPreferencePage implements S
      */
     @Override
     public void widgetSelected(SelectionEvent e) {
+        setApply(true);
         if (e.getSource().equals(activateCheckButton)){
             String text = activateCheckButton.getText();
-            if(text.equals(Messages.Preference_Use_Default)){
+            if(text.startsWith(Messages.Preference_Use_Default)){
                 isSimpleDetailsViewActivated = null;
                 if (isAdminPreference){
                     nameDetailsPref.setAllowOverride(true);

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 7262217e525f7cf2c6c89baf2776341a2eacdb66..71e62c1242c2927cbe6988138a94f825c6a119e2 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
@@ -1316,7 +1316,7 @@ public class PreferencesUtil implements IPreferenceKeys {
         String value;
         if (!local) {
             PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.NameDetailsView);
-            preference = cache.findBestMatching(key);
+            preference =  getPreferenceFromDB(PreferencePredicate.NameDetailsView);
             if (preference == null){
                 return null;
             }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishFlagLocalPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishFlagLocalPreference.java
index d33e3d265f63f88ef07c67115fac9aae0af5aade..c6e2d44bbd610f38135e337593085e5d870ac318 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishFlagLocalPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PublishFlagLocalPreference.java
@@ -162,17 +162,18 @@ public class PublishFlagLocalPreference extends CdmPreferencePage {
 
     @Override
     protected void performDefaults() {
-        publishBehaviour = PublishEnum.valueOf(pref.getValue());
+        publishBehaviour = null;
         allowOverride = true;
         int index = 0;
+
         for (String itemLabel : publishFlagBehaviour.getItems()){
-            if (itemLabel.startsWith(publishBehaviour.getLabel())){
+            if (itemLabel.startsWith(Messages.Preference_Use_Default)){
                 publishFlagBehaviour.select(index);
                 break;
             }
             index++;
         }
-
+        allowOverrideButton.setSelection(allowOverride);
         super.performDefaults();
     }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/RankPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/RankPreference.java
index 9f077eb2f6c5ab7e8c7c26a117784bfecba2e80c..fa930ee85bd8cc9b46b1158c0ed4089ba5580b66 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/RankPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/RankPreference.java
@@ -93,7 +93,13 @@ public class RankPreference extends GeneralTermPreference {
 
     }
 
-
+    @Override
+    protected void performDefaults() {
+        rememberCheckedValues(null);
+        useLocalOrAdmin.select(1);
+        allowOverride = true;
+        setApply(true);
+    }
 
 
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SpecimenOrObservationPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SpecimenOrObservationPreferences.java
index 950a37c33dbf9d5ba415a1822b99ea4268478ca7..ca6854f38f57eba6d5c9a51bb5f069cf65362f2d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SpecimenOrObservationPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SpecimenOrObservationPreferences.java
@@ -121,7 +121,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
         showSpecimenButton.addSelectionListener(this);
         int index = 0;
         for (String itemLabel : showSpecimenButton.getItems()) {
-            if (isShowSpecimenRelatedIssues == null && itemLabel.equals(Messages.Preference_Use_Default)) {
+            if (isShowSpecimenRelatedIssues == null && itemLabel.startsWith(Messages.Preference_Use_Default)) {
                 showSpecimenButton.select(index);
                 break;
             }
@@ -161,7 +161,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
         showCollectingAreaInGeneralSectionButton.addSelectionListener(this);
         index = 0;
         for (String itemLabel : showCollectingAreaInGeneralSectionButton.getItems()) {
-            if (isShowCollectingAreaInGeneralSection == null && itemLabel.equals(Messages.Preference_Use_Default)) {
+            if (isShowCollectingAreaInGeneralSection == null && itemLabel.startsWith(Messages.Preference_Use_Default)) {
                 showCollectingAreaInGeneralSectionButton.select(index);
                 break;
             }
@@ -196,7 +196,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
         determinationOnlyForFieldUnitsButton.addSelectionListener(this);
         index = 0;
         for (String itemLabel : determinationOnlyForFieldUnitsButton.getItems()) {
-            if (isDeterminationOnlyForFieldUnits == null && itemLabel.equals(Messages.Preference_Use_Default)) {
+            if (isDeterminationOnlyForFieldUnits == null && itemLabel.startsWith(Messages.Preference_Use_Default)) {
                 determinationOnlyForFieldUnitsButton.select(index);
                 break;
             }
@@ -232,7 +232,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
         showTaxonAssociationButton.addSelectionListener(this);
         index = 0;
         for (String itemLabel : showTaxonAssociationButton.getItems()) {
-            if (isShowTaxonAssociation == null && itemLabel.equals(Messages.Preference_Use_Default)) {
+            if (isShowTaxonAssociation == null && itemLabel.startsWith(Messages.Preference_Use_Default)) {
                 showTaxonAssociationButton.select(index);
                 break;
             }
@@ -267,7 +267,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
 
         index = 0;
         for (String itemLabel: showLifeFormButton.getItems()) {
-            if (isShowLifeForm == null && itemLabel.equals(Messages.Preference_Use_Default)) {
+            if (isShowLifeForm == null && itemLabel.startsWith(Messages.Preference_Use_Default)) {
                 showLifeFormButton.select(index);
                 break;
             }
@@ -510,56 +510,41 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
 
     @Override
     protected void performDefaults() {
-        isShowSpecimenRelatedIssues = (Boolean)PreferencePredicate.ShowSpecimen.getDefaultValue();
-        if (isShowSpecimenRelatedIssues){
-            showSpecimenButton.select(0);
-        }else{
-            showSpecimenButton.select(1);
-        }
+        isShowSpecimenRelatedIssues = null;
+        showSpecimenButton.select(0);
+
         if (allowOverrideIsShowSpecimenRelatedIssuesButton != null){
             allowOverrideShowSpecimenRelatedIssues = true;
             allowOverrideIsShowSpecimenRelatedIssuesButton.setSelection(allowOverrideShowSpecimenRelatedIssues);
         }
-        isShowCollectingAreaInGeneralSection = (Boolean)PreferencePredicate.ShowCollectingAreasInGeneralSection.getDefaultValue();
-        if (isShowCollectingAreaInGeneralSection){
-            showCollectingAreaInGeneralSectionButton.select(0);
-        }else{
-            showCollectingAreaInGeneralSectionButton.select(1);
-        }
+        isShowCollectingAreaInGeneralSection = null;
+        showCollectingAreaInGeneralSectionButton.select(0);
+
         if (allowOverrideShowCollectingAreaButton != null){
             allowOverrideShowCollectingAreaInGeneralSection = true;
             allowOverrideShowCollectingAreaButton.setSelection(allowOverrideShowSpecimenRelatedIssues);
         }
-        isDeterminationOnlyForFieldUnits = (Boolean) PreferencePredicate.DeterminationOnlyForFieldUnits.getDefaultValue();
-        if (isDeterminationOnlyForFieldUnits){
-            determinationOnlyForFieldUnitsButton.select(0);
-        }else{
-            determinationOnlyForFieldUnitsButton.select(1);
-        }
+        isDeterminationOnlyForFieldUnits = null;
+        determinationOnlyForFieldUnitsButton.select(0);
+
         if (allowOverridesDeterminationOnlyForFieldUnitsButton != null){
             allowOverrideDeterminationOnlyForFieldUnits = true;
             allowOverridesDeterminationOnlyForFieldUnitsButton.setSelection(allowOverrideShowSpecimenRelatedIssues);
         }
 
-        isShowTaxonAssociation = (Boolean) PreferencePredicate.ShowTaxonAssociations.getDefaultValue();
-        if (isShowTaxonAssociation){
-            showTaxonAssociationButton.select(0);
-        }else{
-            showTaxonAssociationButton.select(1);
-        }
+        isShowTaxonAssociation = null;
+        showTaxonAssociationButton.select(0);
+
         if (allowOverrideIsShowTaxonAssociationButton != null){
             allowOverrideShowTaxonAssociation = true;
             allowOverrideIsShowTaxonAssociationButton.setSelection(allowOverrideShowSpecimenRelatedIssues);
         }
 
 
-        isShowLifeForm = (Boolean) PreferencePredicate.ShowLifeForm.getDefaultValue();
+        isShowLifeForm = null;
+
+        showLifeFormButton.select(0);
 
-        if (isShowLifeForm){
-            showLifeFormButton.select(0);
-        }else{
-            showLifeFormButton.select(1);
-        }
         if (allowOverrideShowLifeFormButton != null){
             allowOverrideShowLifeForm = true;
             allowOverrideShowLifeFormButton.setSelection(allowOverrideShowSpecimenRelatedIssues);
@@ -577,7 +562,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
        setApply(true);
        if (e.getSource().equals(this.showSpecimenButton)) {
            String text = showSpecimenButton.getText();
-           if(text.equals(Messages.Preference_Use_Default)){
+           if(text.startsWith(Messages.Preference_Use_Default)){
                isShowSpecimenRelatedIssues = null;
                if (isAdminPreference){
                    allowOverrideIsShowSpecimenRelatedIssuesButton.setSelection(true);
@@ -593,7 +578,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
 
        if (e.getSource().equals(this.showCollectingAreaInGeneralSectionButton)) {
            String text = showCollectingAreaInGeneralSectionButton.getText();
-           if(text.equals(Messages.Preference_Use_Default)){
+           if(text.startsWith(Messages.Preference_Use_Default)){
                isShowCollectingAreaInGeneralSection = null;
                if (isAdminPreference){
                    //showCollectingAreaInGeneralSection.setAllowOverride(true);
@@ -610,7 +595,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
 
        if (e.getSource().equals(this.determinationOnlyForFieldUnitsButton)) {
            String text = determinationOnlyForFieldUnitsButton.getText();
-           if(text.equals(Messages.Preference_Use_Default)){
+           if(text.startsWith(Messages.Preference_Use_Default)){
                isDeterminationOnlyForFieldUnits = null;
                if (isAdminPreference){
                    //showDeterminationOnlyForFieldUnits.setAllowOverride(true);
@@ -627,7 +612,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
 
        if (e.getSource().equals(this.showTaxonAssociationButton)) {
            String text = showTaxonAssociationButton.getText();
-           if(text.equals(Messages.Preference_Use_Default)){
+           if(text.startsWith(Messages.Preference_Use_Default)){
                isShowTaxonAssociation = null;
                if (isAdminPreference){
                    //showTaxonAssociation.setAllowOverride(true);
@@ -644,7 +629,7 @@ public class SpecimenOrObservationPreferences extends CdmPreferencePage implemen
 
        if (e.getSource().equals(this.showLifeFormButton)) {
            String text = showLifeFormButton.getText();
-           if(text.equals(Messages.Preference_Use_Default)){
+           if(text.startsWith(Messages.Preference_Use_Default)){
                isShowLifeForm = null;
                if (isAdminPreference){
                    //showLifeForm.setAllowOverride(true);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SupplementalDataSourcePreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SupplementalDataSourcePreferences.java
index 17eab6400ebb38b3f2ee8b924b482cb3634d63da..85e997625cc59bfafb203f1ac5e679fbbef54c86 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SupplementalDataSourcePreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/SupplementalDataSourcePreferences.java
@@ -122,11 +122,15 @@ public class SupplementalDataSourcePreferences extends CdmPreferencePage impleme
     public boolean performOk() {
         if (isAllowOverrideShowIDSource){
             PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowIdInSource.getKey()), isOverrideShowIDSource);
-            PreferencesUtil.setBooleanValue(PreferencePredicate.ShowIdInSource.getKey(), isShowIDSource);
+            if(isShowIDSource != null){
+                PreferencesUtil.setBooleanValue(PreferencePredicate.ShowIdInSource.getKey(), isShowIDSource);
+            }
         }
         if (isAllowOverrideShowIDNamespace){
-            PreferencesUtil.setBooleanValue(PreferencePredicate.ShowNamespaceInSource.getKey(), isShowIDNamespace);
             PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowNamespaceInSource.getKey()), isOverrideShowIDNamespace);
+            if (isShowIDNamespace != null){
+                PreferencesUtil.setBooleanValue(PreferencePredicate.ShowNamespaceInSource.getKey(), isShowIDNamespace);
+            }
         }
        return true;
    }
@@ -194,4 +198,24 @@ public class SupplementalDataSourcePreferences extends CdmPreferencePage impleme
     public void widgetDefaultSelected(SelectionEvent e) {
     }
 
+    @Override
+    protected void performDefaults() {
+        showIDNamespaceButton.select(0);
+        isShowIDNamespace = null;
+        isAllowOverrideShowIDNamespace=true;
+        isOverrideShowIDNamespace = false;
+        isOverrideShowIDSource = false;
+        if (isAdminPreference){
+            allowOverrideIDSourceButton.setSelection(true);
+            allowOverrideShowIDNamespaceButton.setSelection(true);
+        }
+
+        showIDSourceButton.select(0);
+        isShowIDSource = null;
+        isAllowOverrideShowIDSource=true;
+        super.performDefaults();
+    }
+
+
+
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TermOrder.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TermOrderXX.java
similarity index 90%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TermOrder.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TermOrderXX.java
index f1a7446b26b9a802bdef7e806381085a3de52be5..f58975edb58db3f47c8d3062d1fa32709b06deea 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TermOrder.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/TermOrderXX.java
@@ -15,7 +15,7 @@ import eu.etaxonomy.taxeditor.l10n.Messages;
  * @since 6 Feb 2019
  *
  */
-public enum TermOrder {
+public enum TermOrderXX {
 
     IdInVoc("IdInVoc", Messages.TermOrder_idInVoc),
     Title("Title", Messages.TermOrder_Title),
@@ -25,7 +25,7 @@ public enum TermOrder {
     String label;
     String key;
 
-    private TermOrder(String key, String label){
+    private TermOrderXX(String key, String label){
         this.label = label;
         this.key = key;
     }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java
index d6dd69b72e1eb534ed4afedbac0dd5319fc0d959..57e3b55763af631fd60b2002c88a6f6ba8a2b12e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java
@@ -166,10 +166,16 @@ public abstract class CdmPreferencePage extends PreferencePage implements IE4Pre
 //        if (dbPref != null && !isAdminPage){
 //            defaultValue = Boolean.valueOf(dbPref.getValue());
 //        }else{
-//            defaultValue = (Boolean)predicate.getDefaultValue();
+          boolean defaultValue = (Boolean)predicate.getDefaultValue();
+          String defaultString;
+          if (defaultValue){
+              defaultString = " ("+textTrue+")";
+          }else{
+              defaultString = " ("+textFalse+")";
+          }
 //        }
 //        if (defaultValue){
-            booleanCombo.add(Messages.Preference_Use_Default);
+            booleanCombo.add(Messages.Preference_Use_Default + defaultString);
             booleanCombo.add(textTrue);
             booleanCombo.add(textFalse);
 //        }else{
@@ -190,22 +196,19 @@ public abstract class CdmPreferencePage extends PreferencePage implements IE4Pre
 
         Combo booleanCombo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
 
-//        CdmPreference dbPref = PreferencesUtil.getPreferenceFromDB(predicate);
-//        String defaultValue = null;
-//        if (dbPref != null && !isAdminPage){
-//            defaultValue = dbPref.getValue() != null? dbPref.getValue().toString():null ;
-//        }else{
-//            Object defaultObject = predicate.getDefaultValue();
-//            if (defaultObject != null){
-//                if (defaultObject instanceof IKeyLabel){
-//                    defaultValue = ((IKeyLabel)defaultObject).getKey();
-//                }else{
-//                    defaultValue = predicate.getDefaultValue().toString();
-//                }
-//            }
-//
-//        }
-        booleanCombo.add(Messages.Preference_Use_Default);;
+
+        String defaultValue = null;
+
+        Object defaultObject = predicate.getDefaultValue();
+        if (defaultObject != null){
+            if (defaultObject instanceof IKeyLabel){
+                defaultValue = ((IKeyLabel)defaultObject).getKey();
+            }else{
+                defaultValue = predicate.getDefaultValue().toString();
+            }
+        }
+
+        booleanCombo.add(Messages.Preference_Use_Default + " ("+defaultValue+")");;
         for (IKeyLabel value: enumValues){
             booleanCombo.add(value.getLabel());
         }