ref #8294 Swap showIdInSource and ShowIdNamespace

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SupplementalDataSourceAdminPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SupplementalDataSourceAdminPreference.java
index 6960c827f38094dedf114b1725c3e64958813e88..4bef9930ae9d7263ad8fdcd95f9d85621602f221 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SupplementalDataSourceAdminPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SupplementalDataSourceAdminPreference.java
@@ -21,7 +21,7 @@ import eu.etaxonomy.taxeditor.preference.SupplementalDataSourcePreferences;
 public class SupplementalDataSourceAdminPreference extends SupplementalDataSourcePreferences implements IE4AdminPreferencePage{
 
     private CdmPreference prefShowIdNamespace;
-    private CdmPreference prefShowNamespace;
+    private CdmPreference prefShowIdInSource;
 
     @Override
     public boolean performOk() {
@@ -29,20 +29,20 @@ public class SupplementalDataSourceAdminPreference extends SupplementalDataSourc
             return true;
         }
         boolean setToDefault = false;
-        if (isShowIDNamspace == null){
+        if (isShowIDSource== null){
             setToDefault = true;
-            isShowIDNamspace = true;
+            isShowIDSource= true;
         }
-        CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowIdInSource, Boolean.toString(this.isShowIDNamspace));
-        pref.setAllowOverride(isAllowOverrideShowIDNamspace);
+        CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowIdInSource, Boolean.toString(this.isShowIDSource));
+        pref.setAllowOverride(isAllowOverrideShowIDSource);
         PreferencesUtil.setPreferencesToDB(pref, setToDefault);
 
-        if (isShowIDSource == null){
+        if (isShowIDNamespace== null){
             setToDefault = true;
-            isShowIDSource = true;
+            isShowIDNamespace = true;
         }
-        pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowNamespaceInSource, Boolean.toString(this.isShowIDSource));
-        pref.setAllowOverride(isAllowOverrideShowIDSource);
+        pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowNamespaceInSource, Boolean.toString(this.isShowIDNamespace));
+        pref.setAllowOverride(isAllowOverrideShowIDNamespace);
         PreferencesUtil.setPreferencesToDB(pref, setToDefault);
 
         PreferencesUtil.updateDBPreferences();
@@ -53,21 +53,20 @@ public class SupplementalDataSourceAdminPreference extends SupplementalDataSourc
     protected void getValues(){
         isAdminPreference = true;
 
-        prefShowIdNamespace = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.ShowIdInSource);
+        prefShowIdNamespace = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.ShowNamespaceInSource);
         if (prefShowIdNamespace == null){
-            prefShowIdNamespace = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowIdInSource, null);
+            prefShowIdNamespace = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowNamespaceInSource, null);
             prefShowIdNamespace.setAllowOverride(true);
         }
-        isShowIDNamspace = prefShowIdNamespace.getValue()!= null? Boolean.parseBoolean(prefShowIdNamespace.getValue()): null;
-        isAllowOverrideShowIDNamspace = prefShowIdNamespace.isAllowOverride();
-
+        isShowIDNamespace = prefShowIdNamespace.getValue()!= null? Boolean.parseBoolean(prefShowIdNamespace.getValue()): null;
+        isAllowOverrideShowIDNamespace = prefShowIdNamespace.isAllowOverride();
 
-        prefShowNamespace = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.ShowNamespaceInSource);
-        if (prefShowNamespace == null){
-            prefShowNamespace = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowNamespaceInSource, null);
-            prefShowNamespace.setAllowOverride(true);
+        prefShowIdInSource = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.ShowIdInSource);
+        if (prefShowIdInSource == null){
+            prefShowIdInSource = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowIdInSource, null);
+            prefShowIdInSource.setAllowOverride(true);
         }
-        isShowIDSource = prefShowNamespace.getValue()!= null? Boolean.parseBoolean(prefShowNamespace.getValue()): null;
-        isAllowOverrideShowIDSource = prefShowNamespace.isAllowOverride();
+        isShowIDSource = prefShowIdInSource.getValue()!= null? Boolean.parseBoolean(prefShowIdInSource.getValue()): null;
+        isAllowOverrideShowIDSource = prefShowIdInSource.isAllowOverride();
     }
 }

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 56f1185bf1c595457781b3886ad09836c93f8372..1c1b50529d0bbe6d859f61469afe6454a3a7843a 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
@@ -33,17 +33,17 @@ import eu.etaxonomy.taxeditor.preference.menu.CdmPreferencePage;
  */
 public class SupplementalDataSourcePreferences extends CdmPreferencePage implements SelectionListener{
 
-    protected Boolean isShowIDNamspace;
+    protected Boolean isShowIDNamespace;
     protected Boolean isShowIDSource;
 
-    protected boolean isAllowOverrideShowIDNamspace;
+    protected boolean isAllowOverrideShowIDNamespace;
     protected boolean isAllowOverrideShowIDSource;
 
-    protected boolean isOverrideShowIDNamspace;
+    protected boolean isOverrideShowIDNamespace;
     protected boolean isOverrideShowIDSource;
 
-    protected Combo showIDNamspaceButton;
-    protected Button allowOverrideShowIDNamspaceButton;
+    protected Combo showIDNamespaceButton;
+    protected Button allowOverrideShowIDNamespaceButton;
     protected Combo showIDSourceButton;
     protected Button allowOverrideIDSourceButton;
 
@@ -61,31 +61,7 @@ public class SupplementalDataSourcePreferences extends CdmPreferencePage impleme
         separator.setLayoutData(gridData);
         separator.setVisible(false);
 
-        showIDNamspaceButton = createBooleanCombo(composite, SHOW, DO_NOT_SHOW, PreferencePredicate.ShowIdInSource, "Show ID in Namespace in Source",
-                isAdminPreference);
-
-        showIDNamspaceButton.addSelectionListener(this);
-
-        if (isShowIDNamspace == null || (!isOverrideShowIDNamspace && !isAdminPreference)){
-            showIDNamspaceButton.select(0);
-        }else if (isShowIDNamspace){
-            showIDNamspaceButton.select(1);
-        }else{
-            showIDNamspaceButton.select(2);
-        }
-        if (isAdminPreference){
-            allowOverrideShowIDNamspaceButton = createAllowOverrideButton(composite);
-
-            allowOverrideShowIDNamspaceButton.setSelection(isAllowOverrideShowIDNamspace);
-            allowOverrideShowIDNamspaceButton.addSelectionListener(new SelectionAdapter(){
-                @Override
-                public void widgetSelected(SelectionEvent e) {
-                    isAllowOverrideShowIDNamspace = allowOverrideShowIDNamspaceButton.getSelection();
-                    setApply(true);
-                }
-            });
-        }
-        showIDSourceButton = createBooleanCombo(composite, SHOW, DO_NOT_SHOW, PreferencePredicate.ShowNamespaceInSource, "Show ID in Source",
+        showIDSourceButton = createBooleanCombo(composite, SHOW, DO_NOT_SHOW, PreferencePredicate.ShowIdInSource, "Show ID in Source",
                 isAdminPreference);
         showIDSourceButton.addSelectionListener(this);
         if (isShowIDSource == null || (!isOverrideShowIDSource && !isAdminPreference)){
@@ -107,8 +83,34 @@ public class SupplementalDataSourcePreferences extends CdmPreferencePage impleme
                 }
             });
         }
-        if (!isAllowOverrideShowIDNamspace && !isAdminPreference){
-            showIDNamspaceButton.setEnabled(false);
+
+        showIDNamespaceButton = createBooleanCombo(composite, SHOW, DO_NOT_SHOW, PreferencePredicate.ShowNamespaceInSource, "Show ID Namespace in Source",
+                isAdminPreference);
+
+        showIDNamespaceButton.addSelectionListener(this);
+
+        if (isShowIDNamespace == null || (!isOverrideShowIDNamespace && !isAdminPreference)){
+            showIDNamespaceButton.select(0);
+        }else if (isShowIDNamespace){
+            showIDNamespaceButton.select(1);
+        }else{
+            showIDNamespaceButton.select(2);
+        }
+        if (isAdminPreference){
+            allowOverrideShowIDNamespaceButton = createAllowOverrideButton(composite);
+
+            allowOverrideShowIDNamespaceButton.setSelection(isAllowOverrideShowIDNamespace);
+            allowOverrideShowIDNamespaceButton.addSelectionListener(new SelectionAdapter(){
+                @Override
+                public void widgetSelected(SelectionEvent e) {
+                    isAllowOverrideShowIDNamespace = allowOverrideShowIDNamespaceButton.getSelection();
+                    setApply(true);
+                }
+            });
+        }
+
+        if (!isAllowOverrideShowIDNamespace && !isAdminPreference){
+            showIDNamespaceButton.setEnabled(false);
         }
         if (!isAllowOverrideShowIDSource && !isAdminPreference){
             showIDSourceButton.setEnabled(false);
@@ -118,13 +120,13 @@ public class SupplementalDataSourcePreferences extends CdmPreferencePage impleme
 
     @Override
     public boolean performOk() {
-        if (isAllowOverrideShowIDNamspace){
-            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowIdInSource.getKey()), isOverrideShowIDNamspace);
-            PreferencesUtil.setBooleanValue(PreferencePredicate.ShowIdInSource.getKey(), isShowIDNamspace);
-        }
         if (isAllowOverrideShowIDSource){
-            PreferencesUtil.setBooleanValue(PreferencePredicate.ShowNamespaceInSource.getKey(), isShowIDSource);
-            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowNamespaceInSource.getKey()), isOverrideShowIDSource);
+            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowIdInSource.getKey()), isOverrideShowIDSource);
+            PreferencesUtil.setBooleanValue(PreferencePredicate.ShowIdInSource.getKey(), isShowIDSource);
+        }
+        if (isAllowOverrideShowIDNamespace){
+            PreferencesUtil.setBooleanValue(PreferencePredicate.ShowNamespaceInSource.getKey(), isShowIDNamespace);
+            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowNamespaceInSource.getKey()), isOverrideShowIDNamespace);
         }
        return true;
    }
@@ -133,42 +135,42 @@ public class SupplementalDataSourcePreferences extends CdmPreferencePage impleme
         isAdminPreference = false;
 
         CdmPreferenceCache cache = CdmPreferenceCache.instance();
-        isShowIDNamspace = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowIdInSource.getKey(), true);
-        isOverrideShowIDNamspace = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowIdInSource.getKey()), true) != null?PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowIdInSource.getKey()), true): false;
+        isShowIDSource = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowIdInSource.getKey(), true);
+        isOverrideShowIDSource = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowIdInSource.getKey()), true) != null?PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowIdInSource.getKey()), true): false;
         PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowIdInSource);
         CdmPreference pref = cache.findBestMatching(key);
         if (pref != null){
-            isAllowOverrideShowIDNamspace = pref.isAllowOverride();
+            isAllowOverrideShowIDSource = pref.isAllowOverride();
         }else{
-            isAllowOverrideShowIDNamspace = true;
+            isAllowOverrideShowIDSource = true;
         }
 
-        isShowIDSource = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowNamespaceInSource.getKey(), true);
-        isOverrideShowIDSource = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowNamespaceInSource.getKey()), true) != null? PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowNamespaceInSource.getKey()), true):false;
+        isShowIDNamespace = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowNamespaceInSource.getKey(), true);
+        isOverrideShowIDNamespace = PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowNamespaceInSource.getKey()), true) != null? PreferencesUtil.getBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowNamespaceInSource.getKey()), true):false;
         key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.ShowNamespaceInSource);
         pref = cache.findBestMatching(key);
         if (pref != null){
-            isAllowOverrideShowIDSource = pref.isAllowOverride();
+            isAllowOverrideShowIDNamespace= pref.isAllowOverride();
         }else{
-            isAllowOverrideShowIDSource = true;
+            isAllowOverrideShowIDNamespace = true;
         }
     }
 
     @Override
     public void widgetSelected(SelectionEvent e) {
-        if (e.getSource().equals(this.showIDNamspaceButton)) {
-            String text = showIDNamspaceButton.getText();
+        if (e.getSource().equals(this.showIDNamespaceButton)) {
+            String text = showIDNamespaceButton.getText();
            // text = text.replace(Messages.Preference_Use_Default, "");
             if (text.equals(Messages.Preference_Use_Default)){
-                isOverrideShowIDNamspace = false;
+                isOverrideShowIDNamespace = false;
             }else{
-                isOverrideShowIDNamspace = true;
+                isOverrideShowIDNamespace = true;
             }
             if (text.equals(SHOW)){
-                isShowIDNamspace = true;
+                isShowIDNamespace = true;
 
             }else{
-                isShowIDNamspace = false;
+                isShowIDNamespace = false;
             }
         }
         if (e.getSource().equals(this.showIDSourceButton)) {