Project

General

Profile

« Previous | Next » 

Revision eedeeaee

Added by Cherian Mathew over 8 years ago

#5160 Use new merge methods with uuids as parameters

View differences:

eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
88 88 
				if(entity instanceof Person && mergeTarget instanceof Person) {
89 89 
				    IMergeStrategy strategy = DefaultMergeStrategy.NewInstance(Person.class);
90 90 
				    strategy.setMergeMode("institutionalMemberships", MergeMode.FIRST);
91 
				    CdmStore.getCommonService().merge(mergeTarget.getId(), entity.getId(), Person.class);
91 
				    CdmStore.getCommonService().merge(mergeTarget.getUuid(), entity.getUuid(), Person.class);
92 92 
				} else {
93 93 
				    IMergeStrategy strategy = DefaultMergeStrategy.NewInstance(TeamOrPersonBase.class);
94 
				    CdmStore.getCommonService().merge(mergeTarget.getId(), entity.getId(), TeamOrPersonBase.class);
94 
				    CdmStore.getCommonService().merge(mergeTarget.getUuid(), entity.getUuid(), TeamOrPersonBase.class);
95 95 
				}
96 96 
			} catch (MergeException e) {
97 97 
				MessagingUtils.errorDialog("Bulk Editor Merge Error",

Also available in: Unified diff