Revision cb89f4f7
Added by Andreas Müller almost 5 years ago
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/DynamicFeatureMenuE4.java | ||
---|---|---|
31 | 31 |
import eu.etaxonomy.cdm.model.description.Feature; |
32 | 32 |
import eu.etaxonomy.cdm.model.description.TaxonNameDescription; |
33 | 33 |
import eu.etaxonomy.cdm.model.term.DefinedTermBase; |
34 |
import eu.etaxonomy.cdm.model.term.FeatureNode;
|
|
35 |
import eu.etaxonomy.cdm.model.term.FeatureTree;
|
|
34 |
import eu.etaxonomy.cdm.model.term.TermNode;
|
|
35 |
import eu.etaxonomy.cdm.model.term.TermTree;
|
|
36 | 36 |
import eu.etaxonomy.cdm.model.term.VocabularyEnum; |
37 | 37 |
import eu.etaxonomy.taxeditor.editor.definedterm.input.TermEditorInput; |
38 | 38 |
import eu.etaxonomy.taxeditor.editor.l10n.Messages; |
... | ... | |
61 | 61 |
Object selectedElement = selection.getFirstElement(); |
62 | 62 |
|
63 | 63 |
if (selectedElement instanceof DescriptionBase<?>) { |
64 |
FeatureTree<?> featureTree = getFeatureTree((DescriptionBase<?>) selectedElement);
|
|
64 |
TermTree<?> featureTree = getFeatureTree((DescriptionBase<?>) selectedElement);
|
|
65 | 65 |
|
66 |
for (FeatureNode<?> childNode : featureTree.getRootChildren()) {
|
|
66 |
for (TermNode<?> childNode : featureTree.getRootChildren()) {
|
|
67 | 67 |
createMenuItem(menu, childNode.getTerm(), globalLanguage); |
68 | 68 |
} |
69 | 69 |
} else if (selectedElement instanceof FeatureNodeContainer) { |
70 |
FeatureNode<?> featureNode = ((FeatureNodeContainer) selectedElement)
|
|
70 |
TermNode<?> featureNode = ((FeatureNodeContainer) selectedElement)
|
|
71 | 71 |
.getFeatureNode(); |
72 | 72 |
|
73 | 73 |
// add the feature to the menu |
74 | 74 |
createMenuItem(menu, featureNode.getTerm(), globalLanguage); |
75 | 75 |
|
76 | 76 |
// add possible children to the menu |
77 |
for (FeatureNode<?> childNode : featureNode.getChildNodes()) {
|
|
77 |
for (TermNode<?> childNode : featureNode.getChildNodes()) {
|
|
78 | 78 |
createMenuItem(menu, childNode.getTerm(), globalLanguage); |
79 | 79 |
} |
80 | 80 |
} else if (selectedElement instanceof DescriptionElementBase) { |
... | ... | |
123 | 123 |
* @param description |
124 | 124 |
* @return |
125 | 125 |
*/ |
126 |
private FeatureTree<?> getFeatureTree(DescriptionBase description) {
|
|
127 |
FeatureTree<?> featureTree = null;
|
|
126 |
private TermTree<?> getFeatureTree(DescriptionBase description) {
|
|
127 |
TermTree<?> featureTree = null;
|
|
128 | 128 |
|
129 | 129 |
// TODO change this to the feature tree associated with this taxon |
130 | 130 |
// description |
... | ... | |
138 | 138 |
|
139 | 139 |
if (featureTree == null) { |
140 | 140 |
featureTree = TermEditorInput.getDefaultFeatureTree(); |
141 |
}
|
|
141 |
} |
|
142 | 142 |
if (description instanceof TaxonNameDescription){ |
143 | 143 |
List<Feature> terms = CdmStore.getTermManager().getPreferredTerms(CdmStore.getService(IVocabularyService.class).load(VocabularyEnum.NameFeature.getUuid())); |
144 | 144 |
terms.remove(Feature.PROTOLOGUE()); |
145 |
featureTree = FeatureTree.NewInstance(terms);
|
|
145 |
featureTree = TermTree.NewInstance(terms);
|
|
146 | 146 |
} |
147 | 147 |
|
148 | 148 |
return featureTree; |
Also available in: Unified diff
ref #6794 adapt TaxEditor to new term structure (rename FeatureNode and FeatureTree)