merged/implemented cdm3.3 model adaptations

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / campanula / basicFields / NumberFieldController.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/NumberFieldController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/NumberFieldController.java
index 3fe4eb266c59694ef6855d08393317bfa3342039..34d7415aa931de9196ef7f6d030a89a45ded03d6 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/NumberFieldController.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/basicFields/NumberFieldController.java
@@ -36,36 +36,16 @@ public class NumberFieldController extends TextFieldController {
      * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} object.
      * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} object.
      * @param labelString a {@link java.lang.String} object.
-     * @param initialInteger a {@link java.lang.Integer} object.
+     * @param initialNumber a {@link java.lang.Integer} object.
      * @param style a int.
      */
-    public NumberFieldController(Text controlledText, CdmFormFactory formFactory, ICdmFormElement parentElement, Integer initialInteger){
+    public NumberFieldController(Text controlledText, CdmFormFactory formFactory, ICdmFormElement parentElement, Number initialNumber){
         super(controlledText, formFactory, parentElement, null, null);
         //WindowBuilder exception handling
-        if(initialInteger==null){
-            initialInteger = 0;
+        if(initialNumber==null){
+            initialNumber = 0;
         }
-        setInteger(initialInteger);
-    }
-
-    /**
-     * <p>Constructor for NumberWithLabelElement.</p>
-     *
-     * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} object.
-     * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} object.
-     * @param labelString a {@link java.lang.String} object.
-     * @param initialFloat a {@link java.lang.Float} object.
-     * @param style a int.
-     * @wbp.parser.constructor
-     */
-    public NumberFieldController(Text controlledText, CdmFormFactory formFactory,
-            ICdmFormElement parentElement, Float initialFloat) {
-        super(controlledText, formFactory, parentElement, null, null);
-        //WindowBuilder exception handling
-        if(initialFloat==null){
-            initialFloat = 0f;
-        }
-        setFloat(initialFloat);
+        setNumber(initialNumber);
     }
 
     /**
@@ -78,11 +58,11 @@ public class NumberFieldController extends TextFieldController {
     }
 
     /**
-     * <p>setFloat</p>
+        * <p>setNumber</p>
      *
-     * @param number a {@link java.lang.Float} object.
+        * @param number a {@link java.lang.Number} object.
      */
-    public void setFloat(Float number) {
+       public void setNumber(Number number) {
         super.setText(getStringRepresentation(number));
     }
 
@@ -106,6 +86,16 @@ public class NumberFieldController extends TextFieldController {
         return new Float(text);
     }
 
+       /**
+        * <p>getDouble</p>
+        *
+        * @return a {@link java.lang.Float} object.
+        */
+       public Double getDouble(){
+               String text = super.getText();
+               return new Double(text);
+       }
+
     private String getStringRepresentation(Object number){
         if(number != null){
             return number.toString();