From 9ae9e3873c6b6da5ffeb022bd9eb0763e3b68f46 Mon Sep 17 00:00:00 2001
From: Katja Luther <k.luther@bgbm.org>
Date: Tue, 5 Nov 2013 11:09:49 +0000
Subject: [PATCH] fix deleteAllEmptyNames

---
 .../editor/name/operation/DeleteSynonymOperation.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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 a5ff8285c..76e1b34f8 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
@@ -72,8 +72,12 @@ public class DeleteSynonymOperation extends AbstractPostOperation {
 				controller = (CdmApplicationController) CdmStore.getCurrentApplicationConfiguration();
 				
 				ITaxonService service = controller.getTaxonService();
-				service.deleteSynonym(synonym, null);
-				
+				if (synonym.getId() == 0){
+					taxon.removeSynonym(synonym);
+					
+				} else {
+					service.deleteSynonym(synonym, null);
+				}
 			//	taxon.removeSynonym(synonym);
 //				CdmStore.getTaxonService().deleteSynonymRelationships(synonym);
 //				CdmStore.getTaxonService().delete(synonym);
@@ -82,7 +86,7 @@ public class DeleteSynonymOperation extends AbstractPostOperation {
 
 				// Redraw editor if exists
 				
-				return postExecute(null);
+				return postExecute(taxon);
 	}
 
 	/* (non-Javadoc)
-- 
2.34.1