Merged refactoring from development branch.

[taxeditor.git] / taxeditor-store / src / main / java / eu / etaxonomy / taxeditor / ui / forms / TextWithLabelElement.java

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/TextWithLabelElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/TextWithLabelElement.java
similarity index 92%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/TextWithLabelElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/TextWithLabelElement.java
index d8fc6d2e28d633b11b4dd341a6a467b1cc18d536..866730348c6ec4f16a54f5d7138673e93d2997bb 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/TextWithLabelElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/TextWithLabelElement.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyAdapter;
@@ -16,7 +16,6 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.forms.widgets.TableWrapData;
 
 import eu.etaxonomy.cdm.common.CdmUtils;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.preference.Resources;
 
 /**
@@ -38,8 +37,8 @@ public class TextWithLabelElement extends AbstractCdmFormElement implements Modi
        /**
         * <p>Constructor for TextWithLabelElement.</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 initialText a {@link java.lang.String} object.
         * @param textHeight a {@link java.lang.Integer} object.
@@ -136,14 +135,14 @@ public class TextWithLabelElement extends AbstractCdmFormElement implements Modi
        public void setEnabled(boolean enabled) {
                text.setEnabled(enabled);
                String symbolicName = enabled ? Resources.COLOR_FONT_DEFAULT : Resources.COLOR_TEXT_DISABLED;
-               text.setForeground(EditorUtil.getColor(symbolicName));
+               text.setForeground(getColor(symbolicName));
        }
 
        /** {@inheritDoc} */
        public void setIrrelevant(boolean irrelevant) {
                String colorId = irrelevant ? Resources.COLOR_COMPOSITE_IRRELEVANT : Resources.COLOR_COMPOSITE_BACKGROUND;
                
-               Color color = EditorUtil.getColor(colorId);
+               Color color = getColor(colorId);
                text.setBackground(color);
        }