ref #8526: remove workaround for hotfix

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java
index 0319c8a6fcb591bf3edffa7140c6494a79be4a5d..fb5fdd10eb7bd02cf5d8067b8028d10e79929c2f 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java
@@ -11,7 +11,6 @@ package eu.etaxonomy.taxeditor.editor.name.operation;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.operations.IUndoContext;
@@ -19,10 +18,8 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 
-import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
 import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.api.service.UpdateResult;
-import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.SynonymType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
@@ -78,23 +75,11 @@ public class SwapSynonymAndAcceptedOperation extends AbstractPostTaxonOperation
                monitor.worked(20);
 
                UpdateResult result = CdmStore.getService(ITaxonService.class).swapSynonymAndAcceptedTaxon(synonym.getUuid(), element.getUuid(), setNameInSource);//TODO
-               //Taxon taxon = (Taxon)result.getCdmEntity();
+               Taxon taxon = (Taxon)result.getCdmEntity();
                List<String> propertyPath = new ArrayList<>();
                propertyPath.add("synonyms");
-               Taxon taxon = (Taxon) CdmStore.getService(ITaxonService.class).load(result.getCdmEntity().getUuid(), propertyPath);
-               List<UUID> nodeUuids = new ArrayList<>();
-               for (TaxonNode node: nodes){
-                   nodeUuids.add(node.getUuid());
-        }
-               //nodes = CdmStore.getService(ITaxonNodeService.class).load(nodeUuids, null);
-               List<TaxonNode> parents = new ArrayList<>();
-               for (TaxonNode node: nodes){
-                   TaxonNode parent = HibernateProxyHelper.deproxy(node.getParent(), TaxonNode.class);
-                   TaxonNode newTaxonNode = parent.addChildTaxon(taxon, null, null);
-                   parents.add(parent);
-                   CdmStore.getService(ITaxonNodeService.class).saveNewTaxonNode(newTaxonNode);
-
-               }
+//             Taxon taxon = (Taxon) CdmStore.getService(ITaxonService.class).load(result.getCdmEntity().getUuid(), propertyPath);
+
 
                monitor.worked(40);