From 67a52da658845abb8c28da2d8901dc954f0039bf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Fri, 9 Dec 2022 13:08:00 +0100 Subject: [PATCH] ref #10196 adapt TaxEditor to hybrid structure states --- .../matrix/CategoricalDataHistogram.java | 10 +++++----- .../ui/combo/VocabularyComboElement.java | 19 +++++++++++++------ .../taxeditor/ui/element/CdmFormFactory.java | 8 ++++---- .../section/description/StateDataElement.java | 12 ++++++------ .../feature/AbstractApplicableElement.java | 4 ++-- .../AbstractApplicableElementForDto.java | 2 +- .../feature/FeatureStateWizardPage.java | 12 +++++------- .../userecords/UseRecordDetailElement.java | 4 ++-- ...ifierVocabulariesDtoCollectionSection.java | 4 ++-- .../StateVocabularyCollectionElement.java | 14 +++++++------- .../StateVocabularyCollectionSection.java | 13 ++++++++----- .../StateVocabularyDtoCollectionElement.java | 15 +++++++++------ .../StateVocabularyDtoCollectionSection.java | 1 + 13 files changed, 65 insertions(+), 53 deletions(-) diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CategoricalDataHistogram.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CategoricalDataHistogram.java index d2da9b755..0d461566f 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CategoricalDataHistogram.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CategoricalDataHistogram.java @@ -14,7 +14,7 @@ import java.util.List; import org.apache.commons.math3.stat.Frequency; import eu.etaxonomy.cdm.model.description.Feature; -import eu.etaxonomy.cdm.model.description.State; +import eu.etaxonomy.cdm.model.term.DefinedTermBase; /** * @author pplitzner @@ -24,7 +24,7 @@ public class CategoricalDataHistogram { private Feature feature; private Frequency frequency; - private List states; + private List> states; public CategoricalDataHistogram(Feature feature) { this.feature = feature; @@ -35,15 +35,15 @@ public class CategoricalDataHistogram { .forEach(state->states.add(state))); } - public void addState(State state){ + public void addState(DefinedTermBase state){ frequency.addValue(state.getLabel()); } - public long getCount(State state){ + public long getCount(DefinedTermBase state){ return frequency.getCount(state.getLabel()); } - public List getStates() { + public List> getStates() { return states; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/VocabularyComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/VocabularyComboElement.java index 1f8035598..9691a5800 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/VocabularyComboElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/VocabularyComboElement.java @@ -11,6 +11,7 @@ package eu.etaxonomy.taxeditor.ui.combo; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; +import java.util.EnumSet; import java.util.List; import org.eclipse.jface.util.PropertyChangeEvent; @@ -45,14 +46,20 @@ public class VocabularyComboElement, VOC exte private Comparator vocComparator; - private final TermType termType; + private final EnumSet termTypes; public VocabularyComboElement(CdmFormFactory formFactory, - ICdmFormElement parentElement, TermType termType, String labelString, + ICdmFormElement parentElement, TermType termType, String labelString, + VOC selection, int style){ + this(formFactory, parentElement, EnumSet.of(termType), labelString, selection, style); + } + + public VocabularyComboElement(CdmFormFactory formFactory, + ICdmFormElement parentElement, EnumSet termTypes, String labelString, VOC selection, int style) { super(formFactory, parentElement); - this.termType = termType; + this.termTypes = termTypes; populateTerms(getVocabularies()); @@ -68,11 +75,11 @@ public class VocabularyComboElement, VOC exte } public VocabularyComboElement(CdmFormFactory formFactory, - ICdmFormElement parentElement, TermType termType, String labelString, + ICdmFormElement parentElement, EnumSet termTypes, String label, TermVocabularyDto selection, int style) { super(formFactory, parentElement); - this.termType = termType; + this.termTypes = termTypes; populateTerms(getVocabularies()); @@ -226,7 +233,7 @@ public class VocabularyComboElement, VOC exte } protected List getVocabularies(){ - List> list = CdmStore.getService(IVocabularyService.class).findByTermType(termType, null); + List> list = CdmStore.getService(IVocabularyService.class).findByTermType(termTypes, null); return (List) list; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java index 2a06ae58c..f7a50ff04 100755 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java @@ -10,6 +10,7 @@ package eu.etaxonomy.taxeditor.ui.element; import java.util.ArrayList; import java.util.Comparator; +import java.util.EnumSet; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -87,7 +88,6 @@ import eu.etaxonomy.cdm.model.description.KeyStatement; import eu.etaxonomy.cdm.model.description.MeasurementUnit; import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm; import eu.etaxonomy.cdm.model.description.QuantitativeData; -import eu.etaxonomy.cdm.model.description.State; import eu.etaxonomy.cdm.model.description.StateData; import eu.etaxonomy.cdm.model.description.StatisticalMeasure; import eu.etaxonomy.cdm.model.description.StatisticalMeasurementValue; @@ -1169,8 +1169,8 @@ public class CdmFormFactory extends FormToolkit { } public , VOC extends TermVocabulary> VocabularyComboElement createVocabularyDtoComboElement( - TermType termType, String label, TermVocabularyDto selection, ICdmFormElement parentElement, int style) { - VocabularyComboElement element = new VocabularyComboElement(this, parentElement, termType, label, selection, style); + EnumSet termTypes, String label, TermVocabularyDto selection, ICdmFormElement parentElement, int style) { + VocabularyComboElement element = new VocabularyComboElement(this, parentElement, termTypes, label, selection, style); adapt(element); parentElement.addElement(element); return element; @@ -2848,7 +2848,7 @@ public class CdmFormFactory extends FormToolkit { TermVocabulary termVocabulary = (TermVocabulary)entity; switch (termVocabulary.getTermType()) { case State: - element = new StateVocabularyCollectionElement(this, parentElement, (TermVocabulary) entity, removeListener, backgroundColor, style); + element = new StateVocabularyCollectionElement(this, parentElement, termVocabulary, removeListener, backgroundColor, style); break; case Modifier: element = new RecommendedModifierVocabulariesElement(this, parentElement, (TermVocabulary) entity, removeListener, backgroundColor, style); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataElement.java index a302f8112..8f308e753 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataElement.java @@ -15,9 +15,9 @@ import java.util.Set; import org.eclipse.swt.events.SelectionListener; import eu.etaxonomy.cdm.model.common.LanguageString; -import eu.etaxonomy.cdm.model.description.State; import eu.etaxonomy.cdm.model.description.StateData; import eu.etaxonomy.cdm.model.metadata.PreferencePredicate; +import eu.etaxonomy.cdm.model.term.DefinedTermBase; import eu.etaxonomy.cdm.model.term.TermType; import eu.etaxonomy.cdm.model.term.TermVocabulary; import eu.etaxonomy.taxeditor.preference.PreferencesUtil; @@ -37,7 +37,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement; */ public class StateDataElement extends AbstractEntityCollectionElement { - private TermComboElement combo_state; + private TermComboElement> combo_state; private ModifierSection section_modifiers; private TextWithLabelElement text_modifyingText; @@ -69,10 +69,10 @@ public class StateDataElement extends AbstractEntityCollectionElement @Override public void createControls(ICdmFormElement element, int style) { if (getEntity() != null){ - List stateTerms = new ArrayList<>(); - Set> stateVocabularies = getEntity().getCategoricalData().getFeature().getSupportedCategoricalEnumerations(); - for (TermVocabulary termVocabulary : stateVocabularies) { - stateTerms.addAll(termVocabulary.getTerms()); + List> stateTerms = new ArrayList<>(); + Set> stateVocabularies = getEntity().getCategoricalData().getFeature().getSupportedCategoricalEnumerations(); + for (TermVocabulary termVocabulary : stateVocabularies) { + stateTerms.addAll((Set)termVocabulary.getTerms()); } combo_state = formFactory.createDefinedTermComboElement(stateTerms, element, "State", null, style); }else{ diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/AbstractApplicableElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/AbstractApplicableElement.java index 1cbe82a62..b679e90e8 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/AbstractApplicableElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/AbstractApplicableElement.java @@ -16,7 +16,7 @@ import org.eclipse.swt.graphics.Color; import eu.etaxonomy.cdm.model.description.Feature; import eu.etaxonomy.cdm.model.description.FeatureState; -import eu.etaxonomy.cdm.model.description.State; +import eu.etaxonomy.cdm.model.term.DefinedTermBase; import eu.etaxonomy.taxeditor.ui.combo.term.TermComboElement; import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; @@ -30,7 +30,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement; */ public abstract class AbstractApplicableElement extends AbstractEntityCollectionElement { - private TermComboElement comboState; + private TermComboElement> comboState; private EntitySelectionElement selectFeature; public AbstractApplicableElement(CdmFormFactory formFactory, AbstractFormSection section, FeatureState entity, diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/AbstractApplicableElementForDto.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/AbstractApplicableElementForDto.java index a9bca65b2..2d7d15363 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/AbstractApplicableElementForDto.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/AbstractApplicableElementForDto.java @@ -19,7 +19,7 @@ import org.eclipse.swt.graphics.Color; import eu.etaxonomy.cdm.api.service.ITermService; import eu.etaxonomy.cdm.model.description.Feature; -import eu.etaxonomy.cdm.model.description.State; +import eu.etaxonomy.cdm.model.term.DefinedTermBase; import eu.etaxonomy.cdm.model.term.TermType; import eu.etaxonomy.cdm.persistence.dto.FeatureStateDto; import eu.etaxonomy.taxeditor.store.CdmStore; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureStateWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureStateWizardPage.java index e4aa5cab5..0a4e0242b 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureStateWizardPage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureStateWizardPage.java @@ -31,7 +31,6 @@ import org.eclipse.swt.widgets.Text; import eu.etaxonomy.cdm.api.service.ITermNodeService; import eu.etaxonomy.cdm.model.description.Feature; import eu.etaxonomy.cdm.model.description.FeatureState; -import eu.etaxonomy.cdm.model.description.State; import eu.etaxonomy.cdm.model.term.DefinedTermBase; import eu.etaxonomy.cdm.model.term.TermNode; import eu.etaxonomy.cdm.model.term.TermVocabulary; @@ -58,7 +57,7 @@ public class FeatureStateWizardPage extends AbstractEntityCollectionElementWizar private Button btnSelectState; private TermNodeDto termNode; - private State selectedState = null; + private DefinedTermBase selectedState = null; private List stateVocabulariesDtos = new ArrayList<>(); private Text text; @@ -96,7 +95,7 @@ public class FeatureStateWizardPage extends AbstractEntityCollectionElementWizar if (dialog.open() == IStatus.OK) { Collection additionalTerms = wizard.getAdditionalFeatures(); if(additionalTerms.size()==1){ - selectedState = (State) additionalTerms.iterator().next(); + selectedState = additionalTerms.iterator().next(); text.setText(selectedState.getLabel()); FeatureStateWizardPage.this.getWizard().getContainer().updateButtons(); } @@ -144,8 +143,8 @@ public class FeatureStateWizardPage extends AbstractEntityCollectionElementWizar text.setText(""); selectedState = null; if(feature!=null){ - Set> stateVocabularies = feature.getSupportedCategoricalEnumerations(); - for (TermVocabulary termVocabulary : stateVocabularies) { + Set> stateVocabularies = feature.getSupportedCategoricalEnumerations(); + for (TermVocabulary termVocabulary : stateVocabularies) { stateVocabulariesDtos.add(new TermVocabularyDto(termVocabulary.getUuid(), termVocabulary.getRepresentations(), termVocabulary.getTermType(), termVocabulary.getTitleCache(), termVocabulary.isAllowDuplicates(), termVocabulary.isOrderRelevant(), termVocabulary.isFlat())); } } @@ -165,5 +164,4 @@ public class FeatureStateWizardPage extends AbstractEntityCollectionElementWizar } getWizard().getContainer().updateButtons(); } - -} +} \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java index d4ebce5c0..e9661677a 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java @@ -20,6 +20,7 @@ import org.apache.logging.log4j.Logger; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; +import eu.etaxonomy.cdm.model.common.CdmBase; import eu.etaxonomy.cdm.model.common.Language; import eu.etaxonomy.cdm.model.common.LanguageString; import eu.etaxonomy.cdm.model.common.Marker; @@ -137,7 +138,7 @@ public class UseRecordDetailElement extends String testString = statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText(); if(testString.equals(comboCategory)) { if(statedata.getState() !=null) { - return statedata.getState(); + return CdmBase.deproxy(statedata.getState(), State.class); } } } @@ -556,7 +557,6 @@ public class UseRecordDetailElement extends } } } - } } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/RecommendedModifierVocabulariesDtoCollectionSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/RecommendedModifierVocabulariesDtoCollectionSection.java index d3c10d329..9d245af88 100755 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/RecommendedModifierVocabulariesDtoCollectionSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/RecommendedModifierVocabulariesDtoCollectionSection.java @@ -11,7 +11,7 @@ package eu.etaxonomy.taxeditor.ui.section.vocabulary; import java.util.Collection; import java.util.Comparator; -import eu.etaxonomy.cdm.model.description.State; +import eu.etaxonomy.cdm.model.term.DefinedTerm; import eu.etaxonomy.cdm.model.term.TermType; import eu.etaxonomy.cdm.model.term.TermVocabulary; import eu.etaxonomy.cdm.persistence.dto.FeatureDto; @@ -58,7 +58,7 @@ public class RecommendedModifierVocabulariesDtoCollectionSection extends Abstrac @Override public TermVocabularyDto createNewElement() { - TermVocabulary voc = TermVocabulary.NewInstance(TermType.Modifier); + TermVocabulary voc = TermVocabulary.NewInstance(TermType.Modifier); return new TermVocabularyDto(voc.getUuid(), voc.getRepresentations(), voc.getTermType(), voc.getTitleCache(), voc.isAllowDuplicates(), voc.isOrderRelevant(), voc.isFlat()); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyCollectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyCollectionElement.java index 6bcaf7e4b..b50d873a3 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyCollectionElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyCollectionElement.java @@ -12,7 +12,7 @@ import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Color; import eu.etaxonomy.cdm.model.description.Feature; -import eu.etaxonomy.cdm.model.description.State; +import eu.etaxonomy.cdm.model.term.DefinedTermBase; import eu.etaxonomy.cdm.model.term.TermType; import eu.etaxonomy.cdm.model.term.TermVocabulary; import eu.etaxonomy.taxeditor.ui.combo.VocabularyComboElement; @@ -25,12 +25,12 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement; * @author pplitzner * @date Apr 27, 2015 */ -public class StateVocabularyCollectionElement extends AbstractEntityCollectionElement> { +public class StateVocabularyCollectionElement> + extends AbstractEntityCollectionElement> { + private VocabularyComboElement> comboStateVocabulary; - private VocabularyComboElement> comboStateVocabulary; - - public StateVocabularyCollectionElement(CdmFormFactory formFactory, AbstractFormSection section, TermVocabulary entity, + public StateVocabularyCollectionElement(CdmFormFactory formFactory, AbstractFormSection section, TermVocabulary entity, SelectionListener removeListener, Color backgroundColor, int style) { super(formFactory, section, entity, removeListener, backgroundColor, style); } @@ -44,7 +44,7 @@ public class StateVocabularyCollectionElement extends AbstractEntityCollectionEl } @Override - public void setEntity(TermVocabulary entity) { + public void setEntity(TermVocabulary entity) { this.entity = entity; if(entity.getId()!=0 && comboStateVocabulary != null){ comboStateVocabulary.setSelection(entity); @@ -59,7 +59,7 @@ public class StateVocabularyCollectionElement extends AbstractEntityCollectionEl StateVocabularyCollectionSection parentElement = (StateVocabularyCollectionSection) getParentElement(); Feature feature = parentElement.getEntity(); feature.removeSupportedCategoricalEnumeration(entity); - TermVocabulary vocabulary = comboStateVocabulary.getSelection(); + TermVocabulary vocabulary = comboStateVocabulary.getSelection(); feature.addSupportedCategoricalEnumeration(vocabulary); entity = vocabulary; //update the parent section to re-set the listeners to the persisted measurement unit diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyCollectionSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyCollectionSection.java index 6a1504c43..947213a3f 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyCollectionSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyCollectionSection.java @@ -13,6 +13,7 @@ import java.util.Comparator; import eu.etaxonomy.cdm.model.description.Feature; import eu.etaxonomy.cdm.model.description.State; +import eu.etaxonomy.cdm.model.term.DefinedTermBase; import eu.etaxonomy.cdm.model.term.TermType; import eu.etaxonomy.cdm.model.term.TermVocabulary; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; @@ -24,7 +25,8 @@ import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AbstractUnboundEntityCol * @author pplitzner * @date Apr 27, 2015 */ -public class StateVocabularyCollectionSection extends AbstractUnboundEntityCollectionSection> { +public class StateVocabularyCollectionSection + extends AbstractUnboundEntityCollectionSection> { public StateVocabularyCollectionSection(CdmFormFactory formFactory, ICdmFormElement parentElement, int style) { @@ -32,27 +34,28 @@ public class StateVocabularyCollectionSection extends AbstractUnboundEntityColle } @Override - protected Collection> getEntityCollection(Feature entity) { + protected Collection> getEntityCollection(Feature entity) { return entity.getSupportedCategoricalEnumerations(); } @Override - public Comparator> getComparator() { + public Comparator> getComparator() { return new DefaultCdmBaseComparator<>(); } @Override public TermVocabulary createNewElement() { + //FIXME 10196 return TermVocabulary.NewInstance(TermType.State); } @Override - public void addElement(TermVocabulary element) { + public void addElement(TermVocabulary element) { //never gets called } @Override - public void removeElement(TermVocabulary element) { + public void removeElement(TermVocabulary element) { getEntity().removeSupportedCategoricalEnumeration(element); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyDtoCollectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyDtoCollectionElement.java index 63f9585b0..0299f0da8 100755 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyDtoCollectionElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyDtoCollectionElement.java @@ -8,10 +8,12 @@ */ package eu.etaxonomy.taxeditor.ui.section.vocabulary; +import java.util.EnumSet; + import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Color; -import eu.etaxonomy.cdm.model.description.State; +import eu.etaxonomy.cdm.model.term.DefinedTermBase; import eu.etaxonomy.cdm.model.term.TermType; import eu.etaxonomy.cdm.model.term.TermVocabulary; import eu.etaxonomy.cdm.persistence.dto.FeatureDto; @@ -26,10 +28,10 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement; * @author pplitzner * @date Apr 27, 2015 */ -public class StateVocabularyDtoCollectionElement extends AbstractEntityCollectionElement { - +public class StateVocabularyDtoCollectionElement> + extends AbstractEntityCollectionElement { - private VocabularyComboElement> comboStateVocabulary; + private VocabularyComboElement> comboStateVocabulary; public StateVocabularyDtoCollectionElement(CdmFormFactory formFactory, AbstractFormSection section, TermVocabularyDto entity, SelectionListener removeListener, Color backgroundColor, int style) { @@ -38,7 +40,8 @@ public class StateVocabularyDtoCollectionElement extends AbstractEntityCollectio @Override public void createControls(ICdmFormElement element, int style) { - comboStateVocabulary = formFactory.createVocabularyDtoComboElement(TermType.State, "State vocabulary", null, element, style); + //for now we allow State and Structure here + comboStateVocabulary = formFactory.createVocabularyDtoComboElement(EnumSet.of(TermType.State, TermType.Structure), "State vocabulary", null, element, style); if (entity != null){ setEntity(entity); } @@ -67,7 +70,7 @@ public class StateVocabularyDtoCollectionElement extends AbstractEntityCollectio } } feature.getSupportedCategoricalEnumerations().remove(remove); - TermVocabulary vocabulary = comboStateVocabulary.getSelection(); + TermVocabulary vocabulary = comboStateVocabulary.getSelection(); TermVocabularyDto dto = new TermVocabularyDto(vocabulary.getUuid(), vocabulary.getRepresentations(), vocabulary.getTermType(), vocabulary.getTitleCache(), vocabulary.isAllowDuplicates(), vocabulary.isOrderRelevant(), vocabulary.isFlat()); feature.getSupportedCategoricalEnumerations().add(dto); entity = dto; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyDtoCollectionSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyDtoCollectionSection.java index f06be19ae..ad90f9081 100755 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyDtoCollectionSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyDtoCollectionSection.java @@ -58,6 +58,7 @@ public class StateVocabularyDtoCollectionSection extends AbstractUnboundEntityCo @Override public TermVocabularyDto createNewElement() { + //FIXME 10196 TermVocabulary voc = TermVocabulary.NewInstance(TermType.State); return new TermVocabularyDto(voc.getUuid(), voc.getRepresentations(), voc.getTermType(), voc.getTitleCache(), voc.isAllowDuplicates(), voc.isOrderRelevant(), voc.isFlat()); } -- 2.34.1