Merged refactoring from development branch.

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

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/PointElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/PointElement.java
similarity index 85%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/PointElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/PointElement.java
index a65ddd03f3d0a0ba32905eb02b47544b6625527d..bb65087ce56fe0ff3784323712b05b0b590f5748 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/PointElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/PointElement.java
@@ -8,17 +8,16 @@
 * 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.text.ParseException;
 
 import org.eclipse.jface.util.PropertyChangeEvent;
 
 import eu.etaxonomy.cdm.model.location.Point;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.forms.term.ReferenceSystemComboElement;
 import eu.etaxonomy.taxeditor.preference.Resources;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.taxeditor.ui.term.ReferenceSystemComboElement;
 
 /**
  * <p>PointElement class.</p>
@@ -39,8 +38,8 @@ public class PointElement extends AbstractCdmFormElement implements IEntityEleme
        /**
         * <p>Constructor for PointElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param point a {@link eu.etaxonomy.cdm.model.location.Point} object.
         * @param style a int.
         */
@@ -83,20 +82,20 @@ public class PointElement extends AbstractCdmFormElement implements IEntityEleme
                        try {
                                getPoint().setLatitudeByParsing(text_latitude.getText());
                                text_latitude.setText(point.getLatitudeSexagesimal().toString(false));
-                               text_latitude.setBackground(EditorUtil.getColor(Resources.COLOR_COMPOSITE_BACKGROUND));
+                               text_latitude.setBackground(getColor(Resources.COLOR_COMPOSITE_BACKGROUND));
                                propagate = true;
                        } catch (ParseException e) {
-                               text_latitude.setBackground(EditorUtil.getColor(Resources.COLOR_PARSE_ERROR));
+                               text_latitude.setBackground(getColor(Resources.COLOR_PARSE_ERROR));
                        }
                }
                else if(eventSource == text_longitude){
                        try {
                                getPoint().setLongitudeByParsing(text_longitude.getText());
                                text_longitude.setText(point.getLongitudeSexagesimal().toString(false));
-                               text_longitude.setBackground(EditorUtil.getColor(Resources.COLOR_COMPOSITE_BACKGROUND));
+                               text_longitude.setBackground(getColor(Resources.COLOR_COMPOSITE_BACKGROUND));
                                propagate = true;
                        } catch (ParseException e) {
-                               text_latitude.setBackground(EditorUtil.getColor(Resources.COLOR_PARSE_ERROR));
+                               text_latitude.setBackground(getColor(Resources.COLOR_PARSE_ERROR));
                        }
                }
                else if(eventSource == number_errorRadius){