Merged refactoring from development branch.

[taxeditor.git] / taxeditor-store / src / main / java / eu / etaxonomy / taxeditor / ui / term / AbstractEnumComboElement.java

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/AbstractEnumComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AbstractEnumComboElement.java
similarity index 85%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/AbstractEnumComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AbstractEnumComboElement.java
index 7fa01719f07fda1937ade78580ea794c80b702c1..d9bdbe80a1e46195d11718ad985e02fb884bb98c 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/AbstractEnumComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AbstractEnumComboElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,13 +20,13 @@ import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Label;
 
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.forms.AbstractCdmFormElement;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmPropertyChangeEvent;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.IEnableableFormElement;
 import eu.etaxonomy.taxeditor.preference.Resources;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.IEnableableFormElement;
 
 /**
  * <p>Abstract AbstractEnumComboElement class.</p>
@@ -49,8 +49,8 @@ public abstract class AbstractEnumComboElement<T extends Enum> extends AbstractC
        /**
         * <p>Constructor for AbstractEnumComboElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param <T> a T object.
         */
@@ -138,7 +138,7 @@ public abstract class AbstractEnumComboElement<T extends Enum> extends AbstractC
        public void setIrrelevant(boolean irrelevant) {
                String colorId = irrelevant ? Resources.COLOR_COMPOSITE_IRRELEVANT : Resources.COLOR_COMPOSITE_BACKGROUND;
                
-               Color color = EditorUtil.getColor(colorId);
+               Color color = StoreUtil.getColor(colorId);
                combo.setBackground(color);
        }