Revision 04bb4f0f
Added by Katja Luther over 6 years ago
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java | ||
---|---|---|
12 | 12 |
import java.util.Collections; |
13 | 13 |
import java.util.Comparator; |
14 | 14 |
import java.util.HashMap; |
15 |
import java.util.HashSet; |
|
15 | 16 |
import java.util.List; |
16 | 17 |
import java.util.Map; |
17 | 18 |
import java.util.Map.Entry; |
19 |
import java.util.Set; |
|
18 | 20 |
import java.util.UUID; |
19 | 21 |
|
20 | 22 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolder; |
... | ... | |
55 | 57 |
private List<T> saveCandidates = new ArrayList<>(); |
56 | 58 |
|
57 | 59 |
|
58 |
private List<T> mergeCandidates = new ArrayList<>();
|
|
60 |
private Set<T> mergeCandidates = new HashSet<>();
|
|
59 | 61 |
private T mergeTarget = null; |
60 | 62 |
|
61 | 63 |
private IEntityCreator<T> entityCreator; |
... | ... | |
92 | 94 |
mergeTarget = t; |
93 | 95 |
} |
94 | 96 |
|
95 |
public List<T> getMergeCandidates() {
|
|
97 |
public Set<T> getMergeCandidates() {
|
|
96 | 98 |
return mergeCandidates; |
97 | 99 |
} |
98 | 100 |
|
Also available in: Unified diff
fix #6392: fix remaining bulk editor migration issues