ref #8294 Swap showIdInSource and ShowIdNamespace

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / databaseAdmin / preferencePage / SupplementalDataSourceAdminPreference.java

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();
     }
 }