import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
import eu.etaxonomy.taxeditor.editor.definedterm.TermTransfer;
-import eu.etaxonomy.taxeditor.featuretree.FeatureNodeDtoTransfer;
-import eu.etaxonomy.taxeditor.featuretree.FeatureTreeContentProvider;
-import eu.etaxonomy.taxeditor.featuretree.FeatureTreeLabelProvider;
+import eu.etaxonomy.taxeditor.featuretree.CharacterNodeDtoTransfer;
+import eu.etaxonomy.taxeditor.featuretree.TermTreeContentProvider;
+import eu.etaxonomy.taxeditor.featuretree.TermTreeLabelProvider;
import eu.etaxonomy.taxeditor.l10n.Messages;
import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
import eu.etaxonomy.taxeditor.model.ImageResources;
label_title = new Label(composite_treeTitle, SWT.NULL);
label_title.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
- label_title.setText(Messages.FeatureTreeEditorComposite_FEATURE_TREE);
+ label_title.setText(Messages.TermTreeEditorComposite_FEATURE_TREE);
text_title = new Text(composite_treeTitle, SWT.BORDER);
text_title.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
btnOpenFeatureTree = new Button(composite_treeTitle, SWT.NONE);
btnOpenFeatureTree.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false, 1, 1));
- btnOpenFeatureTree.setToolTipText(Messages.FeatureTreeEditorComposite_OPEN_TREE);
+ btnOpenFeatureTree.setToolTipText(Messages.TermTreeEditorComposite_OPEN_TREE);
btnOpenFeatureTree.setImage(ImageResources.getImage(ImageResources.BROWSE_ICON));
viewer = new TreeViewer(new Tree(this, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI));
label_title.setText(label);
}
- viewer.setContentProvider(new FeatureTreeContentProvider());
- viewer.setLabelProvider(new FeatureTreeLabelProvider());
+ viewer.setContentProvider(new TermTreeContentProvider());
+ viewer.setLabelProvider(new TermTreeLabelProvider());
int ops = DND.DROP_COPY | DND.DROP_MOVE;
if(transfers==null){
transfers = new Transfer[] {
- FeatureNodeDtoTransfer.getInstance(),
+ CharacterNodeDtoTransfer.getInstance(),
TermTransfer.getInstance(),
};
}
}
private void addChildNodesToMap(TermNodeDto root) {
- if (!this.nodeUuidMap.containsKey(root.getUuid())){
- this.nodeUuidMap.put(root.getUuid(), root);
+ this.nodeUuidMap.put(root.getUuid(), root);
+ if (root.getTerm() != null){
+ this.featureTree.addTerm(root.getTerm());
}
for (TermNodeDto child: root.getChildren()){
addChildNodesToMap(child);