ref #3866: adapt deleteHandler to taxonNavigatot changes

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingDeleteTaxonNodeHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingDeleteTaxonNodeHandler.java
index 95b5bc5f6b83d505de51d9387aa2d1cb343d2be6..725e59ae2e597f38eef5f739d78cecee9fe0a5e2 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingDeleteTaxonNodeHandler.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingDeleteTaxonNodeHandler.java
@@ -81,11 +81,13 @@ public class RemotingDeleteTaxonNodeHandler extends RemotingCdmHandler {
         if (treeNodes.size() == 1 ){
                ITaxonTreeNode treeNode = treeNodes.iterator().next();
             ITaxonTreeNode taxonNode = treeNode;
-            if (taxonNode instanceof Classification){
-                taxonNode = CdmApplicationState.getCurrentAppConfig().getClassificationService().load(taxonNode.getUuid());
+            if (taxonNode instanceof TaxonNode && !((TaxonNode)taxonNode).hasTaxon()){
+                taxonNode = CdmApplicationState.getCurrentAppConfig().getClassificationService().load(((TaxonNode)taxonNode).getClassification().getUuid());
             }else{
                 taxonNode = CdmApplicationState.getCurrentAppConfig().getTaxonNodeService().load(taxonNode.getUuid());
             }
+            treeNodes = new HashSet<ITaxonTreeNode>();
+            treeNodes.add(taxonNode);
             if (taxonNode == null){
                MessagingUtils.informationDialog(Messages.RemotingDeleteTaxonNodeHandler_NODE_DELETED, Messages.RemotingDeleteTaxonNodeHandler_NODE_DELETED_MESSAGE);
                return Status.CANCEL_STATUS;