ref #8294 code cleaning

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

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SupplementalDataAdminPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SupplementalDataAdminPreference.java
index f7514a9a72624410bd70be8836d980e7a751fa12..fe17dd74e06e0089fcd4136a0f5a58dc448c6c1e 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SupplementalDataAdminPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/SupplementalDataAdminPreference.java
@@ -10,7 +10,6 @@ package eu.etaxonomy.taxeditor.databaseAdmin.preferencePage;
 
 import eu.etaxonomy.cdm.model.metadata.CdmPreference;
 import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
-import eu.etaxonomy.taxeditor.preference.CdmPreferenceCache;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.preference.SupplementalDataPreferences;
 
@@ -21,9 +20,8 @@ import eu.etaxonomy.taxeditor.preference.SupplementalDataPreferences;
  */
 public class SupplementalDataAdminPreference extends SupplementalDataPreferences {
 
-    CdmPreference prefShowIdNamespace;
-    CdmPreference prefShowNamespace;
-
+    private CdmPreference prefShowIdNamespace;
+    private CdmPreference prefShowNamespace;
 
     @Override
     public boolean performOk() {
@@ -32,8 +30,8 @@ public class SupplementalDataAdminPreference extends SupplementalDataPreferences
         }
         boolean setToDefault = false;
         if (isShowIDNamspace == null){
-           setToDefault = true;
-           isShowIDNamspace = true;
+            setToDefault = true;
+            isShowIDNamspace = true;
         }
         CdmPreference pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowIdInSource, Boolean.toString(this.isShowIDNamspace));
         pref.setAllowOverride(isAllowOverrideShowIDNamspace);
@@ -42,22 +40,19 @@ public class SupplementalDataAdminPreference extends SupplementalDataPreferences
         if (isShowIDSource == null){
             setToDefault = true;
             isShowIDSource = true;
-         }
+        }
         pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowNamespaceInSource, Boolean.toString(this.isShowIDSource));
         pref.setAllowOverride(isAllowOverrideShowIDSource);
         PreferencesUtil.setPreferencesToDB(pref, setToDefault);
 
         PreferencesUtil.updateDBPreferences();
+        return true;
+    }
 
-
-       return true;
-   }
     @Override
     protected void getValues(){
         isAdminPreference = true;
 
-        CdmPreferenceCache cache = CdmPreferenceCache.instance();
-
         prefShowIdNamespace = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.ShowIdInSource);
         if (prefShowIdNamespace == null){
             prefShowIdNamespace = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowIdInSource, null);