From: Andreas Müller <a.mueller@bgbm.org>
Date: Mon, 12 Nov 2018 16:14:47 +0000 (+0100)
Subject: rename SHOW_NAME_IN_SOURCE to SHOW_NAMESPACE_IN_SOURCE in taxeditor
X-Git-Tag: 5.5.0^2~344
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/37058586e2aa2c7df6ffcc0e3934e00a8e19e17f

rename SHOW_NAME_IN_SOURCE to SHOW_NAMESPACE_IN_SOURCE in taxeditor
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java
index 14f04e4ff..0f3aa1170 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java
@@ -261,7 +261,7 @@ public interface IPreferenceKeys {
     public static final String DISABLE_MULTI_CLASSIFICATION = "eu.etaxonomy.taxeditor.classification.multi";
 
     public static final String SHOW_ID_IN_SOURCE = "eu.etaxonomy.taxeditor.source.detail.IdInSource";
-    public static final String SHOW_NAME_IN_SOURCE = "eu.etaxonomy.taxeditor.source.detail.nameInSource";
+    public static final String SHOW_NAMESPACE_IN_SOURCE = "eu.etaxonomy.taxeditor.source.detail.nameInSource";
 
 
 
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 69536e56c..7fb0c6eda 100644
--- 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
@@ -80,7 +80,6 @@ import eu.etaxonomy.taxeditor.ui.dialog.DefaultLanguageDialog;
  * @author p.ciardelli
  * @author n.hoffmann
  * @created 05.12.2008
- * @version 1.0
  */
 public class PreferencesUtil implements IPreferenceKeys {
 
@@ -1978,13 +1977,13 @@ public static void updateDBPreferences() {
         setBooleanValue(SHOW_ID_IN_SOURCE, true);
     }
 
-    preference = getPreferenceFromDB(PreferencePredicate.ShowNameInSource);
+    preference = getPreferenceFromDB(PreferencePredicate.ShowNamespaceInSource);
     if (preference != null){
-        if (!getBooleanValue(SHOW_NAME_IN_SOURCE) ||  !preference.isAllowOverride()){
-            setBooleanValue(SHOW_NAME_IN_SOURCE, Boolean.valueOf(preference.getValue()));
+        if (!getBooleanValue(SHOW_NAMESPACE_IN_SOURCE) ||  !preference.isAllowOverride()){
+            setBooleanValue(SHOW_NAMESPACE_IN_SOURCE, Boolean.valueOf(preference.getValue()));
         }
     }else{
-        setBooleanValue(SHOW_NAME_IN_SOURCE, true);
+        setBooleanValue(SHOW_NAMESPACE_IN_SOURCE, true);
     }
 
     preference = getPreferenceFromDB(PreferencePredicate.DisableMultiClassification);