X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/acc28c93484aa6c01bfa1e1446d1201f936a15aa..ec3a353fdd8c81618684b1d665a833cb4dc46bdf:/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java
index 7f80174c1..c62759b72 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java
@@ -86,15 +86,21 @@ public class ChangeSynonymToAcceptedTaxonOperation extends AbstractPersistentPos
 			throws ExecutionException {
 
 		try {
-			newTaxon = CdmStore.getService(ITaxonService.class).changeSynonymToAcceptedTaxon(synonym, element, true, true, null, null);
+			newNode = (TaxonNode) CdmStore.getService(ITaxonService.class).changeSynonymToAcceptedTaxon(synonym.getUuid(),
+			        element.getUuid(),
+			        parentNode.getUuid(),
+			        true,
+			        true,
+			        null,
+			        null).getCdmEntity();
 		} catch (HomotypicalGroupChangeException e) {
 			MessagingUtils.warningDialog("Operation may lead to inconsistent data", getClass(), e.getMessage());
 			return postExecute(null);
 		}
 		monitor.worked(20);
+		//newTaxon = (Taxon) CdmStore.getService(ITaxonService.class).merge(newTaxon);
+		//element.removeSynonym(synonym);
 
-		element.removeSynonym(synonym);
-		newNode = parentNode.addChildTaxon(newTaxon, null, null);
 
 		/*if(namesInHomotypicGroup != null){
 			Taxon taxon = newNode.getTaxon();
@@ -103,6 +109,7 @@ public class ChangeSynonymToAcceptedTaxonOperation extends AbstractPersistentPos
 
 			}
 		}*/
+		//newNode = CdmStore.getService(ITaxonNodeService.class).merge(newNode);
 
 		monitor.worked(40);