From dfb088796a66bc3216f5c3218b7ccd16a2d91be4 Mon Sep 17 00:00:00 2001
From: Cherian Mathew <c.mathew@bgbm.org>
Date: Wed, 9 Sep 2015 13:15:31 +0200
Subject: [PATCH] #5224 Using new cdmlib call for changing synonym to accepted
 taxon

---
 .../ChangeSynonymToAcceptedTaxonOperation.java | 13 ++++++++++---
 .../TransientTaxonService.java                 | 18 +++++++++---------
 2 files changed, 19 insertions(+), 12 deletions(-)

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 687496ec2..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.getUuid(), element.getUuid(), 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);
 
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
index 8870c5bf5..4c4683c29 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
@@ -1497,15 +1497,6 @@ public class TransientTaxonService implements ITaxonService {
         return defaultService.deleteSynonym(arg0, arg1);
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.api.service.ITaxonService#changeSynonymToAcceptedTaxon(java.util.UUID, java.util.UUID, boolean, boolean, eu.etaxonomy.cdm.model.reference.Reference, java.lang.String)
-     */
-    @Override
-    public Taxon changeSynonymToAcceptedTaxon(UUID arg0, UUID arg1, boolean arg2, boolean arg3, Reference arg4,
-            String arg5) throws HomotypicalGroupChangeException {
-        return defaultService.changeSynonymToAcceptedTaxon(arg0, arg1, arg2, arg3, arg4, arg5);
-    }
-
     /* (non-Javadoc)
      * @see eu.etaxonomy.cdm.api.service.ITaxonService#changeSynonymToRelatedTaxon(java.util.UUID, java.util.UUID, eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType, eu.etaxonomy.cdm.model.reference.Reference, java.lang.String)
      */
@@ -1524,4 +1515,13 @@ public class TransientTaxonService implements ITaxonService {
         return defaultService.changeRelatedTaxonToSynonym(arg0, arg1, arg2, arg3);
     }
 
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.cdm.api.service.ITaxonService#changeSynonymToAcceptedTaxon(java.util.UUID, java.util.UUID, java.util.UUID, boolean, boolean, eu.etaxonomy.cdm.model.reference.Reference, java.lang.String)
+     */
+    @Override
+    public UpdateResult changeSynonymToAcceptedTaxon(UUID arg0, UUID arg1, UUID arg2, boolean arg3, boolean arg4,
+            Reference arg5, String arg6) throws HomotypicalGroupChangeException {
+        return defaultService.changeSynonymToAcceptedTaxon(arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+    }
+
 }
-- 
2.34.1