From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Mon, 1 Jun 2015 08:05:33 +0000 (+0000)
Subject:  - fixed compile error and possible NPE #4810
X-Git-Tag: 3.6.0~20
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/d62b4abe6118a7dc088d841fda2f5a458e124e15

 - fixed compile error and possible NPE #4810
---

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 4508e93a3..868116c20 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
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -32,7 +32,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */
 public class DeleteOperation extends AbstractPersistentPostOperation {
 
-	private PolytomousKey key;
+	private final PolytomousKey key;
 
 	/**
 	 * @param label
@@ -50,15 +50,15 @@ public class DeleteOperation extends AbstractPersistentPostOperation {
 	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
 		bind();
-		
+
 		DeleteResult result = CdmStore.getService(IPolytomousKeyService.class).delete(key);
-		if (result.isError()){
-			MessageDialog.openError(null, "Delete failed", result.getExceptions().get(0).getMessage());
-			
+		if (result.isError() && !result.getExceptions().isEmpty()){
+			MessageDialog.openError(null, "Delete failed", result.getExceptions().iterator().next().getMessage());
+
 		}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 743cb775e..ad739203d 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
@@ -101,9 +101,9 @@ public class DeleteOperation extends AbstractPersistentPostOperation{
 				element = ((TaxonNode)taxonNode).getTaxon();
 
 				DeleteResult result = service.deleteTaxonNode((TaxonNode)taxonNode, config);
-				if (result.isError()){
+				if (result.isError() && !result.getExceptions().isEmpty()){
 					//TODO:Error message!
-					MessageDialog.openError(null, "Delete failed", result.getExceptions().get(0).getMessage());
+					MessageDialog.openError(null, "Delete failed", result.getExceptions().iterator().next().getMessage());
 				}
 
 
@@ -114,11 +114,11 @@ public class DeleteOperation extends AbstractPersistentPostOperation{
 						return null;
 					}
 				}*/
-				
+
 				DeleteResult result = CdmStore.getService(IClassificationService.class).delete(taxonomicTree);
-				if (result.isError()){
+				if (result.isError() && !result.getExceptions().isEmpty()){
 					//TODO:Error message!
-					MessageDialog.openError(null, "Delete failed", result.getExceptions().get(0).getMessage());
+					MessageDialog.openError(null, "Delete failed", result.getExceptions().iterator().next().getMessage());
 				}
 
 				/*}else{
@@ -129,11 +129,11 @@ public class DeleteOperation extends AbstractPersistentPostOperation{
 					}
 				}*/
 			} else {
-				
+
 				DeleteResult result =service.deleteTaxonNodes(treeNodes, config);
-				if (result.isError()){
+				if (result.isError() && !result.getExceptions().isEmpty()){
 					//TODO:Error message!
-					MessageDialog.openError(null, "Delete failed", result.getExceptions().get(0).getMessage());
+					MessageDialog.openError(null, "Delete failed", result.getExceptions().iterator().next().getMessage());
 				}
 			}