Merged refactoring from development branch.

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

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ToggleableTextElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ToggleableTextElement.java
similarity index 93%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ToggleableTextElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ToggleableTextElement.java
index bb27ee3bafcb6be19ff969d0dd03f9b4331be25b..1a7a09a331a8bd701672782cb2f9bb0c6dd54737 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ToggleableTextElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ToggleableTextElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -26,8 +26,8 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.preference.Resources;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 /**
  * When the button is pressed, this textfield may be edited.
@@ -50,8 +50,8 @@ public class ToggleableTextElement extends AbstractCdmFormElement implements Sel
         * <p>Constructor for ToggleableTextElement.</p>
         *
         * @param style a int.
-        * @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 initialState a boolean.
@@ -131,7 +131,7 @@ public class ToggleableTextElement extends AbstractCdmFormElement implements Sel
        public void setEnabled(boolean enabled) {
                text_cache.setEnabled(enabled);
                String symbolicName = enabled ? Resources.COLOR_FONT_DEFAULT : Resources.COLOR_TEXT_DISABLED;
-               text_cache.setForeground(EditorUtil.getColor(symbolicName));
+               text_cache.setForeground(StoreUtil.getColor(symbolicName));
                button_toggle.setSelection(enabled);
        }
 
@@ -192,7 +192,7 @@ public class ToggleableTextElement extends AbstractCdmFormElement implements Sel
        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_cache.setBackground(color);
        }