Revision 77d90448
Added by Katja Luther almost 5 years ago
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierElement.java | ||
---|---|---|
16 | 16 |
|
17 | 17 |
import org.eclipse.swt.events.SelectionListener; |
18 | 18 |
|
19 |
import eu.etaxonomy.cdm.api.service.IVocabularyService; |
|
20 | 19 |
import eu.etaxonomy.cdm.model.description.DescriptionElementBase; |
21 | 20 |
import eu.etaxonomy.cdm.model.description.StateData; |
22 | 21 |
import eu.etaxonomy.cdm.model.description.StatisticalMeasurementValue; |
23 | 22 |
import eu.etaxonomy.cdm.model.term.DefinedTerm; |
24 | 23 |
import eu.etaxonomy.cdm.model.term.TermType; |
25 | 24 |
import eu.etaxonomy.cdm.model.term.TermVocabulary; |
26 |
import eu.etaxonomy.cdm.model.term.VocabularyEnum; |
|
27 |
import eu.etaxonomy.taxeditor.store.CdmStore; |
|
28 | 25 |
import eu.etaxonomy.taxeditor.ui.combo.TermComboElement; |
29 | 26 |
import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection; |
30 | 27 |
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; |
... | ... | |
68 | 65 |
if(parentSection.getEntity() instanceof StateData){ |
69 | 66 |
StateData stateData = (StateData) parentSection.getEntity(); |
70 | 67 |
recommendedModifierEnumeration = stateData.getCategoricalData().getFeature().getRecommendedModifierEnumeration(); |
71 |
} |
|
72 |
if(parentSection.getEntity() instanceof StatisticalMeasurementValue){ |
|
68 |
}else if(parentSection.getEntity() instanceof StatisticalMeasurementValue){ |
|
73 | 69 |
StatisticalMeasurementValue statisticalMeasurementValue = (StatisticalMeasurementValue)parentSection.getEntity(); |
74 | 70 |
recommendedModifierEnumeration = statisticalMeasurementValue.getQuantitativeData().getFeature().getRecommendedModifierEnumeration(); |
75 | 71 |
} |
76 |
if (!(parentSection.getParentElement() instanceof StateDataElement || parentSection.getParentElement() instanceof StatisticalMeasurementValueElement)){ |
|
77 |
recommendedModifierEnumeration.add(CdmStore.getService(IVocabularyService.class).load(VocabularyEnum.Modifier.getUuid())); |
|
72 |
if (!(parentSection.getParentElement() instanceof DescriptionElementBase)){ |
|
73 |
DescriptionElementBase element = (DescriptionElementBase) parentSection.getEntity(); |
|
74 |
recommendedModifierEnumeration = element.getFeature().getRecommendedModifierEnumeration(); |
|
75 |
//recommendedModifierEnumeration.add(CdmStore.getService(IVocabularyService.class).load(VocabularyEnum.Modifier.getUuid())); |
|
78 | 76 |
} |
77 |
|
|
79 | 78 |
for (TermVocabulary<DefinedTerm> termVocabulary : recommendedModifierEnumeration) { |
80 | 79 |
modifierTerms.addAll(termVocabulary.getTerms()); |
81 | 80 |
} |
Also available in: Unified diff
ref #3836: add only recommended modifiers to modifier combo