adding a taxon bulk editor and changes because the delete methods does not throw...

[taxeditor.git] / eu.etaxonomy.taxeditor.navigation / src / main / java / eu / etaxonomy / taxeditor / navigation / navigator / operation / DeleteOperation.java

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/DeleteOperation.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/DeleteOperation.java
index afad39fc6a9cc961ba0ac155afba4982e76fe123..21629870e32e3e63ba7d6878e6034e8f805e8b3f 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/DeleteOperation.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/DeleteOperation.java
@@ -10,7 +10,9 @@
 
 package eu.etaxonomy.taxeditor.navigation.navigator.operation;
 
+import java.util.List;
 import java.util.Set;
+import java.util.UUID;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.operations.IUndoContext;
@@ -99,13 +101,9 @@ public class DeleteOperation extends AbstractPersistentPostOperation{
                                //((TaxonNode) treeNode).delete();
 
                                element = ((TaxonNode)taxonNode).getTaxon();
-                               try {
-                                       service.deleteTaxonNode((TaxonNode)taxonNode, config);
-                               } catch (DataChangeNoRollbackException e) {
-
-                                       throw new ExecutionException(e.getMessage());
-
-                               }
+                               
+                               String result = service.deleteTaxonNode((TaxonNode)taxonNode, config);
+                               //TODO:if result is not a UUIDstring then pop up a message box
 
                        }else if(taxonNode != null && taxonNode instanceof Classification){
                                Classification taxonomicTree = (Classification) taxonNode;
@@ -114,12 +112,9 @@ public class DeleteOperation extends AbstractPersistentPostOperation{
                                                return null;
                                        }
                                }*/
-                               try{
-                                       CdmStore.getService(IClassificationService.class).delete(taxonomicTree);
-                               }catch(ReferencedObjectUndeletableException e){
-                                       throw new ExecutionException(e.getMessage());
-                               }
-
+                               
+                               String result = CdmStore.getService(IClassificationService.class).delete(taxonomicTree);
+                               
 
                                /*}else{
                                        try{
@@ -129,11 +124,9 @@ public class DeleteOperation extends AbstractPersistentPostOperation{
                                        }
                                }*/
                        } else {
-                               try {
-                                       service.deleteTaxonNodes(treeNodes, config);
-                               } catch (DataChangeNoRollbackException e) {
-                                       throw new ExecutionException(e.getMessage());
-                               }
+                               
+                               List<UUID> result =service.deleteTaxonNodes(treeNodes, config);
+                               
                        }
 
                monitor.worked(40);