Merge branch 'release/5.11.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / feature / FeatureDistributionDetailElement.java

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 f9b176e726e10730e7202e2f35312f6df9681469..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;
@@ -40,7 +40,6 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
  *
  * @author n.hoffmann
  * @created Sep 23, 2010
- * @version 1.0
  */
 public class FeatureDistributionDetailElement extends AbstractCdmDetailElement<FeatureNodeContainer> {
 
@@ -57,15 +56,10 @@ public class FeatureDistributionDetailElement extends AbstractCdmDetailElement<F
                super(formFactory, formElement);
        }
 
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#createControls(eu.etaxonomy.taxeditor.forms.ICdmFormElement, eu.etaxonomy.cdm.model.common.AnnotatableEntity, int)
-        */
-       /** {@inheritDoc} */
        @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);
@@ -93,20 +87,11 @@ public class FeatureDistributionDetailElement extends AbstractCdmDetailElement<F
                label.setLayoutData(LayoutConstants.FILL(2, 1));
        }
 
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#handleEvent(java.lang.Object)
-        */
-       /** {@inheritDoc} */
        @Override
        public void handleEvent(Object eventSource) {
                //
        }
 
-       /**
-        * @return
-        * @throws URISyntaxException
-        */
        private String getMapUriString(FeatureNodeContainer container){
                String accessPoint = PreferencesUtil.getMapServiceAccessPoint();
                Map<PresenceAbsenceTerm, java.awt.Color> presenceAbsenceTermColors = null;
@@ -129,9 +114,6 @@ public class FeatureDistributionDetailElement extends AbstractCdmDetailElement<F
                return mapUriString;
        }
 
-       /**
-        * @return
-        */
        private List<TaxonDescription> getTaxonDescriptions() {
                return Arrays.asList(((TaxonDescription) getEntity().getDescription()).getTaxon().getDescriptions().toArray(new TaxonDescription[0]));
        }