Revision a8933813
Added by Cherian Mathew almost 8 years ago
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java | ||
|---|---|---|
| 452 | 452 |
*/ |
| 453 | 453 |
@Override |
| 454 | 454 |
public void merge() {
|
| 455 |
CdmStore.getService(ITaxonNodeService.class).merge(taxonNode); |
|
| 455 |
if(CdmStore.getCurrentSessionManager().isRemoting()) {
|
|
| 456 |
CdmStore.getService(ITaxonNodeService.class).merge(taxonNode, true); |
|
| 457 |
} |
|
| 456 | 458 |
} |
| 457 | 459 |
|
| 458 | 460 |
@Override |
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/CdmAuthorityEditorInput.java | ||
|---|---|---|
| 157 | 157 |
*/ |
| 158 | 158 |
@Override |
| 159 | 159 |
public void merge() {
|
| 160 |
group = CdmStore.getService(IGroupService.class).merge(group); |
|
| 160 |
if(CdmStore.getCurrentSessionManager().isRemoting()) {
|
|
| 161 |
group = CdmStore.getService(IGroupService.class).merge(group); |
|
| 162 |
} |
|
| 161 | 163 |
} |
| 162 | 164 |
} |
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyEditorInput.java | ||
|---|---|---|
| 91 | 91 |
*/ |
| 92 | 92 |
@Override |
| 93 | 93 |
public void merge() {
|
| 94 |
key = CdmStore.getService(IPolytomousKeyService.class).merge(key,true); |
|
| 94 |
if(CdmStore.getCurrentSessionManager().isRemoting()) {
|
|
| 95 |
key = CdmStore.getService(IPolytomousKeyService.class).merge(key,true); |
|
| 96 |
} |
|
| 95 | 97 |
} |
| 96 | 98 |
|
| 97 | 99 |
@Override |
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java | ||
|---|---|---|
| 237 | 237 |
*/ |
| 238 | 238 |
@Override |
| 239 | 239 |
public void merge() {
|
| 240 |
List<SpecimenOrObservationBase> mergedEntities = CdmApplicationState.getCurrentAppConfig().getOccurrenceService().merge(new ArrayList(getRootEntities())); |
|
| 240 |
if(CdmStore.getCurrentSessionManager().isRemoting()) {
|
|
| 241 |
List<SpecimenOrObservationBase> mergedEntities = CdmApplicationState.getCurrentAppConfig().getOccurrenceService().merge(new ArrayList(getRootEntities())); |
|
| 242 |
} |
|
| 241 | 243 |
|
| 242 | 244 |
} |
| 243 | 245 |
|
Also available in: Unified diff
Add check to ensure merge in editors is performed only in remoting