merged trunk into branch

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / description / ScopeElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeElement.java
index 181eb204b25cbe902ab9d8ec6f0541a8434fd0d9..db8e4ea2b5bb1533cb25ad4c730655a7d9cc421f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeElement.java
@@ -10,16 +10,14 @@
 
 package eu.etaxonomy.taxeditor.ui.section.description;
 
-import org.apache.log4j.Logger;
 import org.eclipse.swt.events.SelectionListener;
 
-import eu.etaxonomy.cdm.model.description.Scope;
-import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
+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.section.AbstractEntityCollectionElement;
-import eu.etaxonomy.taxeditor.ui.term.ScopeComboElement;
 
 /**
  * <p>ScopeElement class.</p>
@@ -28,29 +26,28 @@ import eu.etaxonomy.taxeditor.ui.term.ScopeComboElement;
  * @created Mar 18, 2010
  * @version 1.0
  */
-public class ScopeElement extends AbstractEntityCollectionElement<Scope> {
+public class ScopeElement extends AbstractEntityCollectionElement<DefinedTerm> {
        
-       private static final Logger logger = Logger.getLogger(ScopeElement.class);
-       private ScopeComboElement combo_scope;
+       private TermComboElement<DefinedTerm> combo_scope;
 
        /**
         * <p>Constructor for ScopeElement.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
-        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.element.AbstractFormSection} object.
         * @param element a {@link eu.etaxonomy.cdm.model.description.Scope} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.
         */
        public ScopeElement(CdmFormFactory cdmFormFactory,
-                       AbstractFormSection section, Scope element,
+                       AbstractFormSection section, DefinedTerm element,
                        SelectionListener removeListener, int style) {
                super(cdmFormFactory, section, element, removeListener, null, style);
        }
 
        /** {@inheritDoc} */
        @Override
-       public void setEntity(Scope entity) {
+       public void setEntity(DefinedTerm entity) {
                this.entity = entity;
                combo_scope.setSelection(entity);
        }
@@ -58,7 +55,7 @@ public class ScopeElement extends AbstractEntityCollectionElement<Scope> {
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement element, int style) {
-               combo_scope = (ScopeComboElement) formFactory.createTermComboElement(TermComboType.SCOPE, element, "Scope", null, style);
+               combo_scope = formFactory.createTermComboElement(DefinedTerm.class, element, "Scope", null, style);
        }
 
        /** {@inheritDoc} */