Revision d875880c
Added by Cherian Mathew over 8 years ago
| eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CacheLoader.java | ||
|---|---|---|
| 205 | 205 |
public MergeResult<CdmBase> load(MergeResult<CdmBase> mergeResult, boolean recursive, boolean update) {
|
| 206 | 206 |
CdmBase cdmBase = load(mergeResult.getMergedEntity(), recursive, update); |
| 207 | 207 |
load(mergeResult.getNewEntities(), recursive, update); |
| 208 |
return mergeResult;
|
|
| 208 |
return new MergeResult(cdmBase, mergeResult.getNewEntities());
|
|
| 209 | 209 |
} |
| 210 | 210 |
|
| 211 | 211 |
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java | ||
|---|---|---|
| 107 | 107 |
if (eventSource == element_question) {
|
| 108 | 108 |
getEntity().getParent().setQuestion(element_question.updateKeyStatement(getEntity().getQuestion())); |
| 109 | 109 |
} else if (eventSource == element_statement) {
|
| 110 |
getEntity().getParent().setStatement(element_statement.updateKeyStatement(getEntity().getStatement()));
|
|
| 110 |
getEntity().setStatement(element_statement.updateKeyStatement(getEntity().getStatement())); |
|
| 111 | 111 |
} else if (eventSource == selection_feature) {
|
| 112 | 112 |
getEntity().getParent().setFeature(selection_feature.getEntity()); |
| 113 | 113 |
} else if (eventSource == selection_taxon) {
|
Also available in: Unified diff
Fix setting of key statement