Revision ba2406c1
Added by Patrick Plitzner about 8 years ago
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java | ||
---|---|---|
56 | 56 |
Reference sec = taxon.getSec(); |
57 | 57 |
taxon.setSec(null); |
58 | 58 |
try{ |
59 |
<<<<<<< HEAD |
|
60 |
UpdateResult result = CdmStore.getService(ITaxonNodeService.class).createNewTaxonNode(parent.getUuid(), taxon, parent.getReference(), parent.getMicroReference()); |
|
61 |
|
|
62 |
======= |
|
63 | 59 |
UUID parentNodeUuid; |
64 | 60 |
if(parent instanceof Classification){ |
65 | 61 |
parentNodeUuid = ((Classification) parent).getRootNode().getUuid(); |
... | ... | |
69 | 65 |
} |
70 | 66 |
UpdateResult result = CdmStore.getService(ITaxonNodeService.class).createNewTaxonNode(parentNodeUuid, taxon, parent.getReference(), parent.getMicroReference()); |
71 | 67 |
|
72 |
>>>>>>> hotfix/3.12.4 |
|
73 | 68 |
//TaxonNode taxonNode = parent.addChildTaxon(taxon, parent.getReference(), parent.getMicroReference()); |
74 | 69 |
|
75 | 70 |
/* if(CdmStore.getCurrentSessionManager().isRemoting()) { |
... | ... | |
80 | 75 |
generatedTaxonNodeUuid = result.getCdmEntity().getUuid(); |
81 | 76 |
TaxonNode taxonNode = CdmStore.getService(ITaxonNodeService.class).load(generatedTaxonNodeUuid); |
82 | 77 |
taxonNode.getTaxon().setSec(sec); |
83 |
<<<<<<< HEAD |
|
84 |
CdmStore.getService(ITaxonNodeService.class).merge(taxonNode); |
|
85 |
======= |
|
86 | 78 |
CdmStore.getService(ITaxonNodeService.class).merge(taxonNode, true); |
87 |
>>>>>>> hotfix/3.12.4 |
|
88 | 79 |
Set<CdmBase> affectedObjects = new HashSet<CdmBase>(); |
89 | 80 |
if (result.getUpdatedObjects().iterator().hasNext()){ |
90 | 81 |
TaxonNode parentNode = (TaxonNode)result.getUpdatedObjects().iterator().next(); |
91 | 82 |
if(parentNode.getParent() == null) { |
92 | 83 |
affectedObjects.add(taxonNode.getClassification()); |
93 | 84 |
} |
94 |
if(parentNode instanceof TaxonNode) { |
|
95 |
affectedObjects.add(parentNode); |
|
96 |
} |
|
85 |
affectedObjects.add(parentNode); |
|
97 | 86 |
} |
98 |
<<<<<<< HEAD |
|
99 |
|
|
100 |
|
|
101 |
|
|
102 |
======= |
|
103 |
|
|
104 |
|
|
105 |
|
|
106 |
>>>>>>> hotfix/3.12.4 |
|
107 | 87 |
|
108 | 88 |
if(CdmStore.getCurrentSessionManager().isRemoting()) { |
109 | 89 |
CdmApplicationState.getCurrentDataChangeService() |
Also available in: Unified diff
Resolve merge conflict