From: Katja Luther <k.luther@bgbm.org>
Date: Fri, 26 Feb 2016 10:18:40 +0000 (+0100)
Subject: smaller changes to fix moving of taxonnodes
X-Git-Tag: 4.0.0^2~121
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/bd7b2ec496ec18568f5aebea10a804cc5ca77f18?ds=sidebyside

smaller changes to fix moving of taxonnodes
---

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/MoveDescriptionToOtherTaxonOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/MoveDescriptionToOtherTaxonOperation.java
index 1a04b047c..588ef9d1c 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/MoveDescriptionToOtherTaxonOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/MoveDescriptionToOtherTaxonOperation.java
@@ -92,7 +92,7 @@ public class MoveDescriptionToOtherTaxonOperation extends
 		description.addAnnotation(annotation);
 		newAcceptedTaxonNode.getTaxon().addDescription(description);
 		if (CdmApplicationState.getCurrentAppConfig() instanceof CdmApplicationRemoteController) {
-            CdmStore.getService(IDescriptionService.class).merge(description);
+            CdmStore.getService(IDescriptionService.class).merge(description, true);
         } else {
             CdmStore.getService(IDescriptionService.class).saveOrUpdate(description);
         }
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java
index 6b698ffcf..0f16d0e8d 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java
@@ -240,7 +240,7 @@ public class TreeNodeDropAdapterAssistant extends CommonDropAdapterAssistant imp
 				TaxonNode targetNode = (TaxonNode) targetITaxonTreeNode;
 
 				if(CdmStore.getCurrentSessionManager().isRemoting()) {
-				    AbstractOperation operation = new RemotingMoveTaxonOperation(taxonNavigator, false, uuids, targetNode.getParent(), true);
+				    AbstractOperation operation = new RemotingMoveTaxonOperation(taxonNavigator, false, uuids, targetNode, false);
 				    NavigationUtil.executeOperation(operation, null);
 				} else {
 				    AbstractPostOperation operation = new MoveTaxonOperation
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/SelectFeatureTreeWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/SelectFeatureTreeWizardPage.java
index 8e8a12441..409dae7e6 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/SelectFeatureTreeWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/SelectFeatureTreeWizardPage.java
@@ -152,7 +152,7 @@ public class SelectFeatureTreeWizardPage extends WizardPage implements ISelectio
 
 			viewer.add(featureTree);
 			if(CdmStore.getCurrentSessionManager().isRemoting()) {
-                CdmStore.getService(IFeatureTreeService.class).merge(featureTree);
+                CdmStore.getService(IFeatureTreeService.class).merge(featureTree, true);
 			} else {
 			    CdmStore.getService(IFeatureTreeService.class).saveOrUpdate(featureTree);
 			}