Revision 86bbdab9
Added by Katja Luther over 4 years ago
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterEditor.java | ||
---|---|---|
59 | 59 |
import eu.etaxonomy.cdm.api.service.IFeatureNodeService; |
60 | 60 |
import eu.etaxonomy.cdm.api.service.ITermTreeService; |
61 | 61 |
import eu.etaxonomy.cdm.api.service.IVocabularyService; |
62 |
import eu.etaxonomy.cdm.api.service.UpdateResult; |
|
62 | 63 |
import eu.etaxonomy.cdm.model.description.Character; |
63 | 64 |
import eu.etaxonomy.cdm.model.description.Feature; |
64 | 65 |
import eu.etaxonomy.cdm.model.term.DefinedTerm; |
... | ... | |
233 | 234 |
TermNode<Character> parent = ((TermTree<Character>) characterTreeEditorComposite.getViewer().getInput()).getRoot(); |
234 | 235 |
for (Character character : characters) { |
235 | 236 |
//add new Character to feature tree |
236 |
CdmStore.getService(IFeatureNodeService.class).createChildFeatureNode(parent.getUuid(), character, vocabulary.getUuid()); |
|
237 |
UpdateResult result = CdmStore.getService(IFeatureNodeService.class).createChildFeatureNode(parent.getUuid(), character, vocabulary.getUuid()); |
|
238 |
cdmEntitySession.load(result, true); |
|
237 | 239 |
} |
238 | 240 |
refresh(); |
239 | 241 |
} |
... | ... | |
321 | 323 |
TermNode<DefinedTerm> propertyNode = propertiesIterator.next(); |
322 | 324 |
Character character = CharacterTransfer.createCharacter(structureNode, propertyNode); |
323 | 325 |
characters.add(character); |
326 |
|
|
324 | 327 |
} |
325 | 328 |
} |
326 | 329 |
return characters; |
... | ... | |
335 | 338 |
|
336 | 339 |
TermTree<Character> featureTree = characterTreeEditorComposite.getFeatureTree(); |
337 | 340 |
|
338 |
CdmStore.getService(ITermTreeService.class).merge(featureTree); |
|
341 |
CdmStore.getService(ITermTreeService.class).merge(featureTree, true);
|
|
339 | 342 |
|
340 | 343 |
// commit the conversation and start a new transaction immediately |
341 | 344 |
conversation.commit(true); |
... | ... | |
349 | 352 |
Object[] expandedElements = characterTreeEditorComposite.getViewer().getExpandedElements(); |
350 | 353 |
characterTreeEditorComposite.getViewer().getTree().removeAll(); |
351 | 354 |
TermTree tree = (TermTree) characterTreeEditorComposite.getViewer().getInput(); |
355 |
cdmEntitySession.load(tree, true); |
|
352 | 356 |
characterTreeEditorComposite.getViewer().setInput(tree); |
353 | 357 |
characterTreeEditorComposite.getViewer().setExpandedElements(expandedElements); |
354 | 358 |
} |
... | ... | |
398 | 402 |
@Override |
399 | 403 |
public List<TermTree<Character>> getRootEntities() { |
400 | 404 |
List<TermTree<Character>> root = new ArrayList<>(); |
405 |
cdmEntitySession.load(characterTreeEditorComposite.getFeatureTree(), true); |
|
401 | 406 |
root.add(characterTreeEditorComposite.getFeatureTree()); |
402 | 407 |
return root; |
403 | 408 |
} |
... | ... | |
467 | 472 |
public void widgetSelected(SelectionEvent e) { |
468 | 473 |
TermTree tree = FeatureTreeSelectionDialog.select(featureTreeEditorComposite.getDisplay().getActiveShell(), null, termType); |
469 | 474 |
if(tree!=null){ |
475 |
// cdmEntitySession.load(tree, true); |
|
470 | 476 |
featureTreeEditorComposite.setSelectedTree(tree); |
471 | 477 |
} |
472 | 478 |
} |
Also available in: Unified diff
ref #7981: add aggregation wizard to character matrix