Committing changes to definedtermeditor after merge from branch

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / supplemental / MarkerElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerElement.java
index 7c70ac19a28c0d089de70855ae71b1a60e2ceec2..4aecefd1655e670aa295b66ac3a8c8eb976e4ab0 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerElement.java
@@ -7,13 +7,12 @@ import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.MarkerType;
+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.CheckboxElement;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
-import eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement;
 
 /**
  * <p>MarkerElement class.</p>
@@ -38,7 +37,7 @@ public class MarkerElement extends AbstractEntityCollectionElement<Marker>{
                super(cdmFormFactory, formElement, element, removeListener, null, style);
        }
        
-       private AbstractTermComboElement<MarkerType> combo_markerType;
+       private TermComboElement<MarkerType> combo_markerType;
        private CheckboxElement checkbox_markerState;
 
 
@@ -49,7 +48,7 @@ public class MarkerElement extends AbstractEntityCollectionElement<Marker>{
        @Override
        public void createControls(ICdmFormElement element, int style) {
                checkbox_markerState = formFactory.createCheckbox(this, null, false, style);
-               combo_markerType = formFactory.createTermComboElement(TermComboType.MARKERTYPE, this, null, null, style);
+               combo_markerType = formFactory.createTermComboElement(MarkerType.class, this, null, null, style);
        }
 
        /* (non-Javadoc)