From: Katja Luther <k.luther@bgbm.org>
Date: Tue, 10 Mar 2015 12:47:47 +0000 (+0000)
Subject: improve messaging
X-Git-Tag: 3.6.0~190
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/3513a90b2d9190c1d8f58acc81a79cf6a0ad2092

improve messaging
---

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
index b6b990d24..03bb72ac5 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
@@ -10,6 +10,8 @@
 
 package eu.etaxonomy.taxeditor.bulkeditor.handler;
 
+import java.util.Iterator;
+import java.util.Set;
 import java.util.UUID;
 
 import org.eclipse.core.commands.AbstractHandler;
@@ -36,8 +38,11 @@ import eu.etaxonomy.cdm.api.service.IReferenceService;
 import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.api.service.IUserService;
 import eu.etaxonomy.cdm.api.service.config.NameDeletionConfigurator;
+import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
+import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.Group;
+import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.User;
 
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
@@ -46,6 +51,7 @@ import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.cdm.persistence.dao.hibernate.HibernateBeanInitializer;
 import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityPersistenceService;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotation;
@@ -151,7 +157,7 @@ public class DeleteHandler extends AbstractHandler {
 				if (result.isOk() ){
 					((BulkEditor) editor).removeAnnotatedLine(annotation);
 					if(result.getUpdatedObjects().size() != 0 && !result.getExceptions().isEmpty()){
-						MessageDialog.openInformation(null, "Delete successfull", "The Synonym could be deleted, but there is an updated object: " + result.getExceptions().toString());
+						MessagingUtils.informationDialog("Delete successfull", "The object is deleted but there are updated objects: " + result.toString());
 					}
 
 				}
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteSynonymOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteSynonymOperation.java
index 7ac2fd7de..fdef1cd35 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteSynonymOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteSynonymOperation.java
@@ -81,9 +81,9 @@ public class DeleteSynonymOperation extends AbstractPostTaxonOperation {
 					
 					DeleteResult result = service.deleteSynonym(synonym, null);
 					if (result.isError()){
-						MessageDialog.openError(null, "Delete failed", result.getExceptions().get(0).getMessage());
-					} else if (result.getUpdatedObjects().size() != 0){
-						MessageDialog.openInformation(null, "Delete successfull", "The Synonym could be deleted, but there is an updated object: " + result.getExceptions().get(0).getMessage());
+						MessageDialog.openError(null, "Delete failed", result.toString());
+					} else if (!result.getUpdatedObjects().isEmpty()){
+						MessageDialog.openInformation(null, "Delete successfull", "The Synonym could be deleted, but there is an updated object: " + result.toString());
 					}
 				}
 			//	taxon.removeSynonym(synonym);
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java
index e7cd64a7e..136dcf7f4 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java
@@ -19,6 +19,7 @@ import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
@@ -66,7 +67,9 @@ public class DeleteTaxonOperation extends DeleteTaxonBaseOperation{
 
 				DeleteResult result =	service.deleteTaxon(element, configurator, classification);
 				if (result.isError()){
-					MessageDialog.openError(null, "Delete failed", result.getExceptions().get(0).getMessage());
+					MessageDialog.openError(null, "Delete failed", result.toString());
+				} else if (!result.getUpdatedObjects().isEmpty()){
+					MessagingUtils.informationDialog("Delete successfull", result.toString());
 				}
 
 				monitor.worked(40);