Revision 87ada004
Added by Katja Luther about 6 years ago
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java | ||
---|---|---|
22 | 22 |
import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode; |
23 | 23 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
24 | 24 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
25 |
import eu.etaxonomy.cdm.persistence.dto.MergeResult; |
|
25 | 26 |
import eu.etaxonomy.taxeditor.model.MessagingUtils; |
26 | 27 |
import eu.etaxonomy.taxeditor.store.CdmStore; |
28 |
import eu.etaxonomy.taxeditor.ui.section.classification.TaxonNodeDetailElement; |
|
27 | 29 |
import eu.etaxonomy.taxeditor.ui.section.classification.TaxonNodeWizardPage; |
28 | 30 |
|
29 | 31 |
/** |
... | ... | |
76 | 78 |
generatedTaxonNodeUuid = result.getCdmEntity().getUuid(); |
77 | 79 |
TaxonNode taxonNode = CdmStore.getService(ITaxonNodeService.class).load(generatedTaxonNodeUuid); |
78 | 80 |
taxonNode.getTaxon().setSec(sec); |
79 |
CdmStore.getService(ITaxonNodeService.class).merge(taxonNode, true); |
|
81 |
taxonNode.setExcluded(((TaxonNodeDetailElement)taxonNodePage.getDetailElement()).isExcluded()); |
|
82 |
taxonNode.setUnplaced(((TaxonNodeDetailElement)taxonNodePage.getDetailElement()).isUnplaced()); |
|
83 |
MergeResult resultMerge = CdmStore.getService(ITaxonNodeService.class).merge(taxonNode, true); |
|
80 | 84 |
Set<CdmBase> affectedObjects = new HashSet<CdmBase>(); |
81 | 85 |
if (result.getUpdatedObjects().iterator().hasNext()){ |
82 | 86 |
TaxonNode parentNode = (TaxonNode)result.getUpdatedObjects().iterator().next(); |
... | ... | |
85 | 89 |
} |
86 | 90 |
affectedObjects.add(parentNode); |
87 | 91 |
} |
92 |
if (resultMerge.getMergedEntity() instanceof TaxonNode){ |
|
93 |
TaxonNode node = (TaxonNode)resultMerge.getMergedEntity(); |
|
94 |
affectedObjects.remove(node); |
|
95 |
|
|
96 |
affectedObjects.add(node); |
|
97 |
} |
|
88 | 98 |
CdmApplicationState.getCurrentDataChangeService() |
89 | 99 |
.fireChangeEvent(new CdmChangeEvent(Action.Create, affectedObjects, NewTaxonNodeWizard.class), true); |
90 | 100 |
|
Also available in: Unified diff
ref #6533: minor