Revision 92749440
Added by Katja Luther about 5 years ago
| eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java | ||
|---|---|---|
| 32 | 32 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 33 | 33 |
import eu.etaxonomy.cdm.model.common.IdentifiableEntity; |
| 34 | 34 |
import eu.etaxonomy.cdm.model.common.MarkerType; |
| 35 |
import eu.etaxonomy.cdm.persistence.dto.MergeResult; |
|
| 35 | 36 |
import eu.etaxonomy.cdm.strategy.merge.IMergable; |
| 36 | 37 |
import eu.etaxonomy.cdm.strategy.merge.MergeException; |
| 37 | 38 |
import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator; |
| ... | ... | |
| 357 | 358 |
} |
| 358 | 359 |
} |
| 359 | 360 |
if (!saveCandidates.isEmpty()){
|
| 360 |
CdmStore.getService(saveCandidates.iterator().next()).merge(new ArrayList<>(saveCandidates), true); |
|
| 361 |
List<MergeResult<T>> results = CdmStore.getService(saveCandidates.iterator().next()).merge(new ArrayList<>(saveCandidates), true); |
|
| 362 |
for (MergeResult<T> result: results){
|
|
| 363 |
if (result.getMergedEntity() != null){
|
|
| 364 |
T entitiy = result.getMergedEntity(); |
|
| 365 |
} |
|
| 366 |
|
|
| 367 |
} |
|
| 361 | 368 |
} |
| 362 | 369 |
if(resetMerge){
|
| 363 | 370 |
//merge entities |
Also available in: Unified diff
fix #8111: fix saving problem for members in group