Committing changes to definedtermeditor after merge from branch

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

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java
index 6570a1360da8296bf902466df3a91f7da48bbae6..f75a2932e95542d64b96a7f2b7eb722cd683bd9b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java
@@ -8,16 +8,15 @@ import org.eclipse.swt.events.SelectionListener;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.media.Rights;
 import eu.etaxonomy.cdm.model.media.RightsTerm;
+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.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.AbstractSelectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.AgentSelectionElement;
-import eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement;
 
 /**
  * <p>
@@ -54,7 +53,7 @@ public class RightsElement extends AbstractEntityCollectionElement<Rights> {
                super(cdmFormFactory, formElement, element, removeListener, null, style);
        }
 
-       private AbstractTermComboElement<RightsTerm> combo_rightsType;
+       private TermComboElement<RightsTerm> combo_rightsType;
        private AbstractSelectionElement<AgentBase> selection_agent;
        private TextWithLabelElement text;
 
@@ -69,7 +68,7 @@ public class RightsElement extends AbstractEntityCollectionElement<Rights> {
        @Override
        public void createControls(ICdmFormElement element, int style) {
                combo_rightsType = formFactory.createTermComboElement(
-                               TermComboType.RIGHTSTYPE, this, "Rights Type", null, style);
+                               RightsTerm.class, this, "Rights Type", null, style);
                selection_agent = formFactory.createSelectionElement(
                                SelectionType.AGENT, getConversationHolder(), this, "Agent",
                                null, AgentSelectionElement.DEFAULT, style);