Committing changes to definedtermeditor after merge from branch

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / name / NomenclaturalStatusElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NomenclaturalStatusElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NomenclaturalStatusElement.java
index 516f254bf647a37608793d68eb39c8affc8049fb..b7930d17e2317ca1e08994977567ba28464650ba 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NomenclaturalStatusElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NomenclaturalStatusElement.java
@@ -14,6 +14,7 @@ import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
@@ -21,9 +22,7 @@ import eu.etaxonomy.taxeditor.ui.forms.IEntityElement;
 import eu.etaxonomy.taxeditor.ui.forms.ISelectableElement;
 import eu.etaxonomy.taxeditor.ui.forms.SelectionArbitrator;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
 import eu.etaxonomy.taxeditor.ui.section.supplemental.AbstractReferencedEntityElement;
-import eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement;
 
 /**
  * <p>NomenclaturalStatusElement class.</p>
@@ -34,7 +33,7 @@ import eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement;
  */
 public class NomenclaturalStatusElement extends AbstractReferencedEntityElement<NomenclaturalStatus> implements IEntityElement<NomenclaturalStatus>, ISelectableElement{
 
-       private AbstractTermComboElement<NomenclaturalStatusType> nomenclaturalStatusTypeCombo;
+       private TermComboElement<NomenclaturalStatusType> nomenclaturalStatusTypeCombo;
        
        private TextWithLabelElement ruleConsideredText;
        
@@ -61,7 +60,7 @@ public class NomenclaturalStatusElement extends AbstractReferencedEntityElement<
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement element, int style) {
-               nomenclaturalStatusTypeCombo = formFactory.createTermComboElement(TermComboType.NOMENCLATURALSTATUSTYPE, this, "Nomenclatural Status Type", null, style);
+               nomenclaturalStatusTypeCombo = formFactory.createTermComboElement(NomenclaturalStatusType.class, this, "Nomenclatural Status Type", null, style);
                ruleConsideredText = formFactory.createTextWithLabelElement(this, "Rule Considered", "", style);
                
                super.createControls(element, style);