Revision f6ba2ccb
Added by Katja Luther over 3 years ago
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterEditor.java | ||
---|---|---|
85 | 85 |
import eu.etaxonomy.taxeditor.editor.l10n.Messages; |
86 | 86 |
import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants; |
87 | 87 |
import eu.etaxonomy.taxeditor.featuretree.CharacterTransfer; |
88 |
import eu.etaxonomy.taxeditor.featuretree.FeatureTreeContentProvider; |
|
89 |
import eu.etaxonomy.taxeditor.featuretree.FeatureTreeLabelProvider; |
|
90 |
import eu.etaxonomy.taxeditor.featuretree.e4.FeatureNodeDtoDragListener; |
|
91 |
import eu.etaxonomy.taxeditor.featuretree.e4.FeatureTreeDtoDropAdapter; |
|
88 |
import eu.etaxonomy.taxeditor.featuretree.TermTreeContentProvider; |
|
89 |
import eu.etaxonomy.taxeditor.featuretree.TermTreeLabelProvider; |
|
92 | 90 |
import eu.etaxonomy.taxeditor.featuretree.e4.FeatureTreeDtoEditorComposite; |
93 | 91 |
import eu.etaxonomy.taxeditor.featuretree.e4.ICharacterEditor; |
92 |
import eu.etaxonomy.taxeditor.featuretree.e4.TermNodeDtoDragListener; |
|
93 |
import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeDtoDropAdapter; |
|
94 | 94 |
import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeEditor; |
95 | 95 |
import eu.etaxonomy.taxeditor.model.AbstractUtility; |
96 | 96 |
import eu.etaxonomy.taxeditor.model.IDirtyMarkable; |
... | ... | |
265 | 265 |
}); |
266 | 266 |
|
267 | 267 |
characterTreeEditorComposite = addFeatureTreeEditor(composite_3); |
268 |
initFeatureTreeComposite(TermType.Character, characterTreeEditorComposite, new FeatureNodeDtoDragListener(characterTreeEditorComposite.getViewer()),
|
|
269 |
new FeatureTreeDtoDropAdapter(this, characterTreeEditorComposite.getViewer(), sync),
|
|
268 |
initFeatureTreeComposite(TermType.Character, characterTreeEditorComposite, new TermNodeDtoDragListener(characterTreeEditorComposite.getViewer()),
|
|
269 |
new TermTreeDtoDropAdapter(this, characterTreeEditorComposite.getViewer(), sync),
|
|
270 | 270 |
null); |
271 | 271 |
|
272 | 272 |
characterTreeEditorComposite.getLabel_title().setText(Messages.CharacterEditor_CHARACTERS); |
... | ... | |
290 | 290 |
|
291 | 291 |
TreeViewer viewer = new TreeViewer(composite); |
292 | 292 |
viewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1)); |
293 |
viewer.setContentProvider(new FeatureTreeContentProvider());
|
|
294 |
viewer.setLabelProvider(new FeatureTreeLabelProvider());
|
|
293 |
viewer.setContentProvider(new TermTreeContentProvider());
|
|
294 |
viewer.setLabelProvider(new TermTreeLabelProvider());
|
|
295 | 295 |
viewer.setComparator(new FeatureTreeViewerComparator()); |
296 | 296 |
viewer.addSelectionChangedListener(this); |
297 | 297 |
viewer.setInput(CdmStore.getService(ITermTreeService.class).list(termType, null, null, null, TermTreeEditor.TREE_PROPERTY_PATH)); |
... | ... | |
307 | 307 |
} |
308 | 308 |
|
309 | 309 |
private <T extends DefinedTermBase> FeatureTreeDtoEditorComposite<T> addFeatureTreeEditor(Composite composite_3) { |
310 |
FeatureTreeDtoEditorComposite<T> featureTreeEditorComposite = new FeatureTreeDtoEditorComposite<>(composite_3, SWT.NONE);
|
|
311 |
featureTreeEditorComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
|
|
312 |
return featureTreeEditorComposite;
|
|
310 |
FeatureTreeDtoEditorComposite<T> TermTreeEditorComposite = new FeatureTreeDtoEditorComposite<>(composite_3, SWT.NONE);
|
|
311 |
TermTreeEditorComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
|
|
312 |
return TermTreeEditorComposite;
|
|
313 | 313 |
} |
314 | 314 |
|
315 | 315 |
private void initFeatureTreeComposite( |
316 | 316 |
TermType termType, |
317 |
FeatureTreeDtoEditorComposite featureTreeEditorComposite,
|
|
318 |
FeatureNodeDtoDragListener featureNodeDragListener,
|
|
319 |
FeatureTreeDtoDropAdapter featureNodeDropAdapter,
|
|
317 |
FeatureTreeDtoEditorComposite TermTreeEditorComposite,
|
|
318 |
TermNodeDtoDragListener featureNodeDragListener,
|
|
319 |
TermTreeDtoDropAdapter featureNodeDropAdapter,
|
|
320 | 320 |
Transfer[] transfers) { |
321 | 321 |
|
322 |
featureTreeEditorComposite.init(
|
|
322 |
TermTreeEditorComposite.init(
|
|
323 | 323 |
featureNodeDragListener, |
324 | 324 |
featureNodeDropAdapter, |
325 | 325 |
transfers, |
326 | 326 |
this, |
327 |
new FeatureTreeChooserListener(featureTreeEditorComposite, termType),
|
|
327 |
new FeatureTreeChooserListener(TermTreeEditorComposite, termType),
|
|
328 | 328 |
this); |
329 | 329 |
} |
330 | 330 |
|
... | ... | |
539 | 539 |
} |
540 | 540 |
|
541 | 541 |
private class FeatureTreeChooserListener extends SelectionAdapter{ |
542 |
private FeatureTreeDtoEditorComposite<Feature> featureTreeEditorComposite;
|
|
542 |
private FeatureTreeDtoEditorComposite<Feature> TermTreeEditorComposite;
|
|
543 | 543 |
private TermType termType; |
544 | 544 |
|
545 |
public FeatureTreeChooserListener(FeatureTreeDtoEditorComposite<Feature> featureTreeEditorComposite, TermType termType) {
|
|
545 |
public FeatureTreeChooserListener(FeatureTreeDtoEditorComposite<Feature> TermTreeEditorComposite, TermType termType) {
|
|
546 | 546 |
super(); |
547 |
this.featureTreeEditorComposite = featureTreeEditorComposite;
|
|
547 |
this.TermTreeEditorComposite = TermTreeEditorComposite;
|
|
548 | 548 |
this.termType = termType; |
549 | 549 |
} |
550 | 550 |
|
551 | 551 |
@Override |
552 | 552 |
public void widgetSelected(SelectionEvent e) { |
553 |
TermTree tree = FeatureTreeSelectionDialog.select(featureTreeEditorComposite.getDisplay().getActiveShell(), null, termType);
|
|
553 |
TermTree tree = FeatureTreeSelectionDialog.select(TermTreeEditorComposite.getDisplay().getActiveShell(), null, termType);
|
|
554 | 554 |
if(tree!=null){ |
555 | 555 |
cdmEntitySession.load(tree, true); |
556 |
featureTreeEditorComposite.setSelectedTree(tree);
|
|
556 |
TermTreeEditorComposite.setSelectedTree(tree);
|
|
557 | 557 |
} |
558 | 558 |
} |
559 | 559 |
} |
Also available in: Unified diff
ref 9337: rename all termtree related classes