corrected usage of service calls returning update/delete result objects

[taxeditor.git] / eu.etaxonomy.taxeditor.navigation / src / main / java / eu / etaxonomy / taxeditor / navigation / navigator / operation / MoveTaxonOperation.java

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java
index c65b17388fe4282b3aa9c3cc6e9968349f4e22c1..14b19f62d6ddf6985340fdce736804df55798d62 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java
@@ -10,7 +10,6 @@
 package eu.etaxonomy.taxeditor.navigation.navigator.operation;
 
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
@@ -23,7 +22,7 @@ import org.eclipse.core.runtime.Status;
 
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
-import eu.etaxonomy.cdm.model.common.CdmBase;
+import eu.etaxonomy.cdm.api.service.UpdateResult;
 import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
 import eu.etaxonomy.cdm.model.taxon.IllegalAncestryException;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
@@ -53,7 +52,7 @@ public class MoveTaxonOperation extends AbstractPersistentPostOperation {
 
        private final Set<TaxonNode> taxonNodes;
 
-       private final ICdmEntitySessionEnabled cdmEntitySessionEnabled;
+
        /**
         * <p>Constructor for MoveTaxonOperation.</p>
         *
@@ -83,7 +82,7 @@ public class MoveTaxonOperation extends AbstractPersistentPostOperation {
                        this.oldParentTreeNodes.put(taxonNode, taxonNode.getParent());
                }
 
-               this.cdmEntitySessionEnabled = cdmEntitySessionEnabled;
+
        }
 
        /* (non-Javadoc)
@@ -96,14 +95,10 @@ public class MoveTaxonOperation extends AbstractPersistentPostOperation {
                bind();
                monitor.worked(20);
 
-               Set<CdmBase> affectedObjects = new HashSet<CdmBase>();
+
                try {
                        for (TaxonNode taxonNode : taxonNodes){
-                           TaxonNode newTaxonNode = CdmStore.getService( ITaxonNodeService.class).moveTaxonNode(taxonNode.getUuid(), newParentTreeNode.getUuid());
-                               affectedObjects.add(newTaxonNode.getParent());
-                               //FIXME:Remoting testing until UpdateResult is ready
-                               affectedObjects.add(newTaxonNode.getParent().getParent());
-                               cdmEntitySessionEnabled.getCdmEntitySession().update(newTaxonNode, affectedObjects);
+                           UpdateResult result = CdmStore.getService( ITaxonNodeService.class).moveTaxonNode(taxonNode.getUuid(), newParentTreeNode.getUuid());
                                monitor.worked(2);
                        }