fix #8725: move also admin preference

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/DistributionDetailsViewAdminPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/DistributionDetailsViewAdminPreference.java
new file mode 100755 (executable)
index 0000000..9556d04
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/DistributionDetailsViewAdminPreference.java
@@ -0,0 +1,42 @@
+/**
+* Copyright (C) 2020 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+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.DistributionDetailsViewPreference;
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
+
+/**
+ * @author k.luther
+ * @since Apr 8, 2020
+ */
+public class DistributionDetailsViewAdminPreference extends DistributionDetailsViewPreference {
+    @Override
+    public void getValues(){
+        isAdminPreference = true;
+
+        prefShowIdInVoc = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.NamedAreaWithIdInVoc);
+
+        allowOverrideShowIdInVoc = getPrefAllowOverride(prefShowIdInVoc);
+        isShowIdInVoc = getBooleanPrefValue(prefShowIdInVoc);
+   }
+
+    @Override
+    public boolean performOk() {
+        if (isApply()){
+            prefShowIdInVoc = CdmPreference.NewTaxEditorInstance(PreferencePredicate.NamedAreaWithIdInVoc, isShowIdInVoc != null? Boolean.toString(this.isShowIdInVoc): null);
+            prefShowIdInVoc.setAllowOverride(allowOverrideShowIdInVoc);
+            PreferencesUtil.setPreferenceToDB(prefShowIdInVoc);
+            setApply(false);
+        }
+        return true;
+    }
+
+}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/FactualDataAdminPreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/FactualDataAdminPreferencePage.java
index 2298484c6b168c17430aadd5d27bdc1a3bf4e83e..eddbf96043f645afd88ac49b7f830d8e5065d1ed 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/FactualDataAdminPreferencePage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/FactualDataAdminPreferencePage.java
@@ -34,12 +34,7 @@ public class FactualDataAdminPreferencePage extends FactualDataPreference {
 
         allowOverrideFreeText = getPrefAllowOverride(prefFreeText);
         isShowModifierFreeText = getBooleanPrefValue(prefFreeText);
-
-        prefShowIdInVoc = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.NamedAreaWithIdInVoc);
-
-        allowOverrideShowIdInVoc = getPrefAllowOverride(prefShowIdInVoc);
-        isShowIdInVoc = getBooleanPrefValue(prefShowIdInVoc);
-        }
+    }
 
 
 
@@ -53,11 +48,6 @@ public class FactualDataAdminPreferencePage extends FactualDataPreference {
             prefFreeText = CdmPreference.NewTaxEditorInstance(PreferencePredicate.ShowModifierFreeText, isShowModifierFreeText != null? Boolean.toString(this.isShowModifierFreeText): null);
             prefFreeText.setAllowOverride(allowOverrideFreeText);
             PreferencesUtil.setPreferenceToDB(prefFreeText);
-
-            prefShowIdInVoc = CdmPreference.NewTaxEditorInstance(PreferencePredicate.NamedAreaWithIdInVoc, isShowIdInVoc != null? Boolean.toString(this.isShowIdInVoc): null);
-            prefShowIdInVoc.setAllowOverride(allowOverrideShowIdInVoc);
-            PreferencesUtil.setPreferenceToDB(prefShowIdInVoc);
-
             setApply(false);
         }
         return true;