X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/18358a529a0a508bad94a1a2ba23582b89d81385..cf3d9f7610096dee6e4e78013ac42090047f481f:/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 e3021facf..f9b176e72 100644
--- 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
@@ -1,4 +1,3 @@
-// $Id$
 /**
 * Copyright (C) 2007 EDIT
 * European Distributed Institute of Taxonomy
@@ -19,10 +18,11 @@ import java.util.Map;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Label;
 
-import eu.etaxonomy.cdm.api.application.CdmApplicationRemoteConfiguration;
+import eu.etaxonomy.cdm.api.application.CdmApplicationRemoteController;
 import eu.etaxonomy.cdm.common.UriUtils;
 import eu.etaxonomy.cdm.ext.geo.IEditGeoService;
 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.taxeditor.model.FeatureNodeContainer;
@@ -65,16 +65,21 @@ public class FeatureDistributionDetailElement extends AbstractCdmDetailElement<F
 	@Override
 	protected void createControls(ICdmFormElement formElement, FeatureNodeContainer entity,
 			int style) {
-		String serviceUriString = PreferencesUtil.getPreferenceStore().getString(IPreferenceKeys.EDIT_MAP_SERVICE_ACCES_POINT);
+		String serviceUriString = PreferencesUtil.getStringValue(IPreferenceKeys.EDIT_MAP_SERVICE_ACCES_POINT);
 		String message = null;
 		try {
 			URI serviceUri = new URI(serviceUriString);
 			if(UriUtils.isServiceAvailable(serviceUri, 500)){
 				image = formFactory.createBrowserElement(formElement, null, style);
-				String mapUriString = getMapUriString(getEntity());
-				image.setImageUriString(mapUriString);
+				// FIXME : This is a temporary workaround which ic
+				//         waiting for #5357 to be fixed
+				if(!isUnsavedDistribution(getEntity())) {
+				    String mapUriString = getMapUriString(getEntity());
+				    image.setImageUriString(mapUriString);
+				    message = mapUriString;
+				}
 				formElement.getLayoutComposite().layout();
-				message = mapUriString;
+
 				return;
 			} else {
 				message = String.format("The service is not available: %s", serviceUriString);
@@ -108,10 +113,10 @@ public class FeatureDistributionDetailElement extends AbstractCdmDetailElement<F
 		// FIXME due to a bug in the rest map service we have to ensure that width will always be an even number
 		// image.calculateWidth() % 2 == 1 ? image.calculateWidth() + 1 :
 		int width = image.calculateWidth();
-
+		 IEditGeoService editGeoService;
 		List<Language> languages = Arrays.asList(new Language[]{CdmStore.getDefaultLanguage()});
+		editGeoService = ((CdmApplicationRemoteController)CdmStore.getCurrentApplicationConfiguration()).getEditGeoService();
 
-		IEditGeoService editGeoService = ((CdmApplicationRemoteConfiguration)CdmStore.getCurrentApplicationConfiguration()).getEditGeoService();
 		String parameter = editGeoService.getDistributionServiceRequestParameterString(
 				getTaxonDescriptions(),
                 false,
@@ -131,4 +136,13 @@ public class FeatureDistributionDetailElement extends AbstractCdmDetailElement<F
 		return Arrays.asList(((TaxonDescription) getEntity().getDescription()).getTaxon().getDescriptions().toArray(new TaxonDescription[0]));
 	}
 
+	private boolean isUnsavedDistribution(FeatureNodeContainer container) {
+	    for(DescriptionElementBase dist : container.getDescriptionElements()) {
+	        if(dist.getId() == 0) {
+	            return true;
+	        }
+	    }
+	    return false;
+	}
+
 }