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

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / operation / RemotingCdmDefaultOperation.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/RemotingCdmMergeOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/RemotingCdmDefaultOperation.java
similarity index 74%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/RemotingCdmMergeOperation.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/RemotingCdmDefaultOperation.java
index b93937e9d3037efbd31b531bc019b8c58f120842..4ac9dc3a0b2e5347ecbbd236622cc30ab11aa099 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/RemotingCdmMergeOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/RemotingCdmDefaultOperation.java
@@ -22,11 +22,11 @@ import eu.etaxonomy.cdm.model.common.CdmBase;
  * @date 21 Jul 2015
  *
  */
-public abstract class RemotingCdmMergeOperation extends RemotingCdmOperation {
+public abstract class RemotingCdmDefaultOperation extends RemotingCdmOperation {
 
-    private CdmBase mergedCdmEntity;
+    private CdmBase cdmEntity;
 
-    public RemotingCdmMergeOperation(String label, Action action, Object source, boolean async) {
+    public RemotingCdmDefaultOperation(String label, Action action, Object source, boolean async) {
         super(label, action, source, async);
     }
     /* (non-Javadoc)
@@ -35,19 +35,19 @@ public abstract class RemotingCdmMergeOperation extends RemotingCdmOperation {
     @Override
     protected boolean doExecute(IProgressMonitor monitor, IAdaptable info) {
         try {
-            mergedCdmEntity = doMergeExecute(monitor, info);
+            cdmEntity = doSimpleExecute(monitor, info);
         } catch (Exception e) {
              throw new RuntimeException(e);
         }
         return true;
     }
 
-    protected abstract CdmBase doMergeExecute(IProgressMonitor monitor, IAdaptable info) throws Exception;
+    protected abstract CdmBase doSimpleExecute(IProgressMonitor monitor, IAdaptable info) throws Exception;
 
     @Override
     protected void postExecute(boolean success) {
-        if(success && mergedCdmEntity != null) {
-            fireDataChangeEvent(mergedCdmEntity);
+        if(success && cdmEntity != null) {
+            fireDataChangeEvent(cdmEntity);
         }
 
     }