use preferencePredicate.EditMapServiceAccessPoint in featureDistribution detailsview

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 2ae5e0812d7d1ae663588614830833868a51ff06..ad4eb54f00395984314e128927f41d916159545c 100644 (file)
--- 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
@@ -249,7 +249,7 @@ public class PreferencesUtil implements IPreferenceKeys {
                         return pred.getDefaultValue().toString();
                     }
                 }
-                return null;
+                return prefValue;
             }
 
        }else if (pref != null){

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java
index eb9bb7a33649eed30fba2a679785dea2c7e1c28b..5cccce17f3ec892b734fea224c601983bc3680c6 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java
@@ -25,8 +25,8 @@ import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
+import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
-import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.element.BrowserElement;
@@ -59,7 +59,7 @@ public class FeatureDistributionDetailElement extends AbstractCdmDetailElement<F
        @Override
        protected void createControls(ICdmFormElement formElement, FeatureNodeContainer entity,
                        int style) {
-               String serviceUriString = PreferencesUtil.getStringValue(IPreferenceKeys.EDIT_MAP_SERVICE_ACCES_POINT);
+               String serviceUriString = PreferencesUtil.getStringValue(PreferencePredicate.EditMapServiceAccessPoint.getKey());
                String message = null;
                try {
                        URI serviceUri = new URI(serviceUriString);