From: Cherian Mathew <c.mathew@bgbm.org>
Date: Mon, 23 Nov 2015 15:29:19 +0000 (+0100)
Subject: #5160 Use new merge methods with uuids as parameters
X-Git-Tag: 3.12.0^2~56^2~5
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/eedeeaee89c37fcd404dcb0e4504d5f6b8236e95

#5160 Use new merge methods with uuids as parameters
---

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java
index 150e3b1aa..00f746d97 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java
@@ -239,7 +239,7 @@ public abstract class AbstractBulkEditorInput<T extends ICdmBase> extends CdmEnt
     public boolean merge(T entity, T mergeTarget) {
 		if (entity instanceof IMergable) {
 			try {
-				CdmStore.getCommonService().merge(mergeTarget.getId(), entity.getId(), (Class<? extends CdmBase>)entity.getClass());
+				CdmStore.getCommonService().merge(mergeTarget.getUuid(), entity.getUuid(), (Class<? extends CdmBase>)entity.getClass());
 			} catch (MergeException e) {
 				MessagingUtils.errorDialog("Bulk Editor Merge Error",
 						this,
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
index 6423cece7..f7f65de9f 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
@@ -88,10 +88,10 @@ public class AgentEditorInput extends AbstractBulkEditorInput<TeamOrPersonBase>
 				if(entity instanceof Person && mergeTarget instanceof Person) {
 				    IMergeStrategy strategy = DefaultMergeStrategy.NewInstance(Person.class);
 				    strategy.setMergeMode("institutionalMemberships", MergeMode.FIRST);
-				    CdmStore.getCommonService().merge(mergeTarget.getId(), entity.getId(), Person.class);
+				    CdmStore.getCommonService().merge(mergeTarget.getUuid(), entity.getUuid(), Person.class);
 				} else {
 				    IMergeStrategy strategy = DefaultMergeStrategy.NewInstance(TeamOrPersonBase.class);
-				    CdmStore.getCommonService().merge(mergeTarget.getId(), entity.getId(), TeamOrPersonBase.class);
+				    CdmStore.getCommonService().merge(mergeTarget.getUuid(), entity.getUuid(), TeamOrPersonBase.class);
 				}
 			} catch (MergeException e) {
 				MessagingUtils.errorDialog("Bulk Editor Merge Error",