merge-update from trunk

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

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PointElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PointElement.java
index 6ed881b074fd789475e4bb170731b730c09d7d66..30a9ce77d2e561c383f859c08b1f9da83acf4424 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PointElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PointElement.java
@@ -1,9 +1,9 @@
 // $Id$
 /**
  * Copyright (C) 2007 EDIT
- * European Distributed Institute of Taxonomy 
+ * European Distributed Institute of Taxonomy
  * http://www.e-taxonomy.eu
- * 
+ *
  * The contents of this file are subject to the Mozilla Public License Version 1.1
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
@@ -17,13 +17,14 @@ import org.eclipse.jface.util.PropertyChangeEvent;
 import eu.etaxonomy.cdm.model.location.Point;
 import eu.etaxonomy.cdm.model.location.ReferenceSystem;
 import eu.etaxonomy.taxeditor.preference.Resources;
+import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 
 /**
  * <p>
  * PointElement class.
  * </p>
- * 
+ *
  * @author n.hoffmann
  * @created Oct 15, 2010
  * @version 1.0
@@ -46,7 +47,7 @@ public class PointElement extends AbstractCdmFormElement implements
         * <p>
         * Constructor for PointElement.
         * </p>
-        * 
+        *
         * @param formFactory
         *            a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
         *            object.
@@ -65,16 +66,16 @@ public class PointElement extends AbstractCdmFormElement implements
                formFactory.addPropertyChangeListener(this);
 
                text_latitude = formFactory.createTextWithLabelElement(formElement,
-                               "Latitude (hexagesimal)", null, style);
+                               "Latitude", null, style);
                text_latitudeParsed = formFactory.createTextWithLabelElement(
                                formElement, "", null, style);
                text_latitudeParsed.setEnabled(false);
                text_longitude = formFactory.createTextWithLabelElement(formElement,
-                               "Longitude (hexagesimal)", null, style);
+                               "Longitude", null, style);
                text_longitudeParsed = formFactory.createTextWithLabelElement(
                                formElement, "", null, style);
                text_longitudeParsed.setEnabled(false);
-               number_errorRadius = formFactory.createIntegerTextWithLabelElement(
+               number_errorRadius = formFactory.createNumberTextWithLabelElement(
                                formElement, "Error Radius (m)", null, style);
                combo_referenceSystem = formFactory
                                .createTermComboElement(ReferenceSystem.class,
@@ -85,7 +86,7 @@ public class PointElement extends AbstractCdmFormElement implements
 
        /*
         * (non-Javadoc)
-        * 
+        *
         * @see
         * eu.etaxonomy.taxeditor.forms.AbstractCdmFormElement#propertyChange(org
         * .eclipse.jface.util.PropertyChangeEvent)
@@ -139,7 +140,7 @@ public class PointElement extends AbstractCdmFormElement implements
 
        /*
         * (non-Javadoc)
-        * 
+        *
         * @see eu.etaxonomy.taxeditor.forms.IEntityElement#getEntity()
         */
        /** {@inheritDoc} */
@@ -152,7 +153,7 @@ public class PointElement extends AbstractCdmFormElement implements
         * <p>
         * setEntity
         * </p>
-        * 
+        *
         * @param point
         *            a {@link eu.etaxonomy.cdm.model.location.Point} object.
         */
@@ -164,7 +165,7 @@ public class PointElement extends AbstractCdmFormElement implements
         * <p>
         * Setter for the field <code>point</code>.
         * </p>
-        * 
+        *
         * @param point
         *            the point to set
         */
@@ -179,7 +180,7 @@ public class PointElement extends AbstractCdmFormElement implements
                        text_latitudeParsed.setText(latitude);
                        text_longitude.setText(longitude);
                        text_longitudeParsed.setText(longitude);
-                       number_errorRadius.setInteger(point.getErrorRadius());
+                       number_errorRadius.setNumber(point.getErrorRadius());
                        combo_referenceSystem.setSelection(point.getReferenceSystem());
                }
        }
@@ -188,7 +189,7 @@ public class PointElement extends AbstractCdmFormElement implements
         * <p>
         * Getter for the field <code>point</code>.
         * </p>
-        * 
+        *
         * @return the point
         */
        public Point getPoint() {
@@ -199,8 +200,9 @@ public class PointElement extends AbstractCdmFormElement implements
                return point;
        }
 
-       public void setSelected(boolean selected) {
+       @Override
+    public void setSelected(boolean selected) {
                setBackground(selected ? SELECTED : getPersistentBackground());
        }
-       
+
 }