From: Katja Luther <k.luther@bgbm.org>
Date: Tue, 16 Sep 2014 07:26:45 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 3.6.0~439
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/4bd586937edebacc8106af55b49baa1e019a7a59

---

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/operation/DeleteOperation.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/operation/DeleteOperation.java
index 59001c82a..7c8b588be 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/operation/DeleteOperation.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/operation/DeleteOperation.java
@@ -58,8 +58,8 @@ public class DeleteOperation extends AbstractPersistentPostOperation {
 		if (result.isError()){
 			MessageDialog.openError(null, "Delete failed", result.getExceptions().get(0).getMessage());
 			
-		}else if(!result.getExceptions().isEmpty()){
-			//TODO:Warning!
+		}else if(result.isAbort()){
+			MessageDialog.openWarning(null, "Delete abort", "The object could not be deleted, maybe there was no object selected.");
 		}
 		
 		return postExecute(null);
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 32286abb5..743cb775e 100644
--- 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
@@ -114,7 +114,7 @@ public class DeleteOperation extends AbstractPersistentPostOperation{
 						return null;
 					}
 				}*/
-
+				
 				DeleteResult result = CdmStore.getService(IClassificationService.class).delete(taxonomicTree);
 				if (result.isError()){
 					//TODO:Error message!
@@ -129,7 +129,12 @@ public class DeleteOperation extends AbstractPersistentPostOperation{
 					}
 				}*/
 			} else {
-				service.deleteTaxonNodes(treeNodes, config);
+				
+				DeleteResult result =service.deleteTaxonNodes(treeNodes, config);
+				if (result.isError()){
+					//TODO:Error message!
+					MessageDialog.openError(null, "Delete failed", result.getExceptions().get(0).getMessage());
+				}
 			}
 
 		monitor.worked(40);