#5247 Fix duplicate entity issue for new entities by using the new merge service...

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / key / polytomous / operation / RemotingCreatePolytomousKeyNodeOperation.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/RemotingCreatePolytomousKeyNodeOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/RemotingCreatePolytomousKeyNodeOperation.java
index 61c75bb8b9b71bebbe70a7daef0150b77f4b9ba0..c63350eea36c3a4c860ad8f0a1f6b214af254094 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/RemotingCreatePolytomousKeyNodeOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/RemotingCreatePolytomousKeyNodeOperation.java
@@ -12,18 +12,17 @@ package eu.etaxonomy.taxeditor.editor.key.polytomous.operation;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 
-import eu.etaxonomy.cdm.api.application.CdmApplicationState;
 import eu.etaxonomy.cdm.api.application.CdmChangeEvent.Action;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
-import eu.etaxonomy.taxeditor.operation.RemotingCdmMergeOperation;
+import eu.etaxonomy.taxeditor.operation.RemotingCdmDefaultOperation;
 
 /**
  * @author cmathew
  * @date 21 Jul 2015
  *
  */
-public class RemotingCreatePolytomousKeyNodeOperation extends RemotingCdmMergeOperation {
+public class RemotingCreatePolytomousKeyNodeOperation extends RemotingCdmDefaultOperation {
 
     private final PolytomousKeyNode parentNode;
 
@@ -35,15 +34,15 @@ public class RemotingCreatePolytomousKeyNodeOperation extends RemotingCdmMergeOp
         super(LABEL, Action.Create, source, async);
         this.parentNode = parentNode;
     }
+
     /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.operation.RemotingCdmMergeOperation#doMergeExecute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
+     * @see eu.etaxonomy.taxeditor.operation.RemotingCdmSimpleOperation#doSimpleExecute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
      */
     @Override
-    protected CdmBase doMergeExecute(IProgressMonitor monitor, IAdaptable info) throws Exception {
-        PolytomousKeyNode childNode = PolytomousKeyNode.NewInstance();
-        parentNode.addChild(childNode);
-        //childNode.getModifyingText().put(CdmStore.getDefaultLanguage(),LanguageString.NewInstance("",CdmStore.getDefaultLanguage()));
-        return CdmApplicationState.getCurrentAppConfig().getPolytomousKeyNodeService().merge(parentNode);
+    protected CdmBase doSimpleExecute(IProgressMonitor monitor, IAdaptable info) throws Exception {
+      PolytomousKeyNode childNode = PolytomousKeyNode.NewInstance();
+      parentNode.addChild(childNode);
+      return childNode;
     }
 
 }