Merge branch 'develop' into LibrAlign

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

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ExtensionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ExtensionElement.java
index 84db702e99e9a40892aef9a48a95dee755c41e72..45f9f9181a1afde7f5407d0f1205e335bc0f9b61 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ExtensionElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ExtensionElement.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
@@ -8,10 +8,11 @@ import org.eclipse.swt.events.SelectionListener;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.Extension;
 import eu.etaxonomy.cdm.model.common.ExtensionType;
-import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
 import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
@@ -27,7 +28,7 @@ public class ExtensionElement extends AbstractEntityCollectionElement<Extension>
 
        private TermComboElement<ExtensionType> combo_extensionType;
        private TextWithLabelElement text_extensionValue;
-       
+
        /**
         * <p>Constructor for ExtensionElement.</p>
         *
@@ -48,7 +49,7 @@ public class ExtensionElement extends AbstractEntityCollectionElement<Extension>
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement element, int style) {
-               combo_extensionType = formFactory.createTermComboElement(ExtensionType.class, this, null, null, style);
+               combo_extensionType = formFactory.createDefinedTermComboElement(TermType.ExtensionType, this, null, null, style);
                text_extensionValue = formFactory.createTextWithLabelElement(element, null, null, style);
                text_extensionValue.getLayoutComposite().setLayoutData(LayoutConstants.FILL_HORIZONTALLY());
        }
@@ -62,7 +63,7 @@ public class ExtensionElement extends AbstractEntityCollectionElement<Extension>
                this.entity = element;
                ExtensionType extensionType = (ExtensionType) HibernateProxyHelper.deproxy(element.getType());
                combo_extensionType.setSelection(extensionType);
-               text_extensionValue.setText(element.getValue());        
+               text_extensionValue.setText(element.getValue());
        }
 
        /*