merge-update from trunk

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/DeleteNodeOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/DeleteNodeOperation.java
index a5a0122d1f65b14de1dd562b6286ef98e2cb792d..02097b6f25ee1bc53d71548259f45b7ea9d3bfe6 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/DeleteNodeOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/DeleteNodeOperation.java
@@ -8,6 +8,8 @@ import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.ui.handlers.HandlerUtil;
 
 import eu.etaxonomy.cdm.api.application.CdmApplicationController;
 import eu.etaxonomy.cdm.api.service.IPolytomousKeyNodeService;
@@ -43,16 +45,20 @@ public class DeleteNodeOperation extends AbstractPostTaxonOperation {
        @Override
        public IStatus execute(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
-
+               
                //parent.removeChild(node);
                CdmApplicationController controller;
                
                controller = (CdmApplicationController) CdmStore.getCurrentApplicationConfiguration();
                
                IPolytomousKeyNodeService service = controller.getPolytomousKeyNodeService();
-               
-               service.delete(node, true);
-
+               if (node.getChildren().size()>0){
+                       if(! MessageDialog.openQuestion(null, "Confirm deletion of children", "The selected node has children, do you want to delete them, too?")) {
+                               service.delete(node, false);
+                       }
+               } else{
+                       service.delete(node, true);
+               }
                return postExecute(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 d18b9d7a5f4a7ce2c238be9695e33bd6afb953e4..c95e7b04eaaba61d2d0becc47acc5366d4a49bf4 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
@@ -10,6 +10,7 @@
 
 package eu.etaxonomy.taxeditor.ui.section.feature;
 
+import java.awt.Color;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Arrays;
@@ -112,7 +113,8 @@ public class FeatureDistributionDetailElement extends AbstractCdmDetailElement<F
 
                List<Language> languages = Arrays.asList(new Language[]{CdmStore.getDefaultLanguage()});
                
-               String parameter = CdmStore.getGeoService().getDistributionServiceRequestParameterString(getTaxonDescriptions(), presenceAbsenceTermColors, width, 0, bbox, backLayer, languages);
+               String parameter = CdmStore.getGeoService().getDistributionServiceRequestParameterString(getTaxonDescriptions(), 
+                false, false, presenceAbsenceTermColors, width, 0, bbox, backLayer, languages);
                
                String mapUriString = String.format("%s?%s&ms=1000", accessPoint, parameter);
                return mapUriString;