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 1a04b047cc568120fd57bf35534136d4dc6fd4ea..588ef9d1c22bc2384abd76f2c6172cca532dd4bc 100644 (file)
--- 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) {
                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);
         }
         } 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 6b698ffcff7b570b5d594d0724a0f60be9286269..0f16d0e8d075650a4028e95aba411948672f66ee 100644 (file)
--- 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()) {
                                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
                                    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 8e8a12441070851c78350530f44210288d366ed6..409dae7e618292496c491b0506838e6f42cda02b 100644 (file)
--- 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()) {
 
                        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);
                        }
                        } else {
                            CdmStore.getService(IFeatureTreeService.class).saveOrUpdate(featureTree);
                        }