Merged refactoring from development branch.

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

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/AbstractTermComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AbstractTermComboElement.java
similarity index 88%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/AbstractTermComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AbstractTermComboElement.java
index 29074f896a54fab623e3c8f00eb4c7580d1a6340..f06672c182e436056cb8a3e87c617140346d9016 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/AbstractTermComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AbstractTermComboElement.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 
 import java.util.ArrayList;
@@ -22,16 +22,16 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
 
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-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.PreferencesUtil;
 import eu.etaxonomy.taxeditor.preference.Resources;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.store.TermManager;
+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 AbstractTermComboElement class.</p>
@@ -60,9 +60,9 @@ public abstract class AbstractTermComboElement<T extends DefinedTermBase> extend
        /**
         * <p>Constructor for AbstractTermComboElement.</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param labelString a {@link java.lang.String} object.
         * @param selection a T object.
         * @param visibleItems a int.
@@ -147,10 +147,10 @@ public abstract class AbstractTermComboElement<T extends DefinedTermBase> extend
                        if (label == null) {
                                if(term.getTitleCache() != null){
                                        label = term.getTitleCache();
-                                       EditorUtil.error(getClass(), "Term does not have a representation: " + term + ", " + term.getUuid(), null);
+                                       StoreUtil.error(getClass(), "Term does not have a representation: " + term + ", " + term.getUuid(), null);
                                }else{
                                        label = "Unknown";
-                                       EditorUtil.error(getClass(), "Representation Label and TitleCache empty for term: " + term + ", " + term.getUuid(), null);
+                                       StoreUtil.error(getClass(), "Representation Label and TitleCache empty for term: " + term + ", " + term.getUuid(), null);
                                }
                                
                        }
@@ -264,7 +264,7 @@ public abstract class AbstractTermComboElement<T extends DefinedTermBase> extend
        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);
        }