- changed layout so that two colums are used for label and text field

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

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElementComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmNumberField.java
similarity index 87%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElementComposite.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmNumberField.java
index a80e02be7fcd5097f028547c8088f50dd50d2fe4..890ad088f6066c017cc87840a108d22063778003 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElementComposite.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmNumberField.java
@@ -19,10 +19,10 @@ import eu.etaxonomy.cdm.common.CdmUtils;
 
 /**
  * @author pplitzner
- * @date 31.07.2013
+ * @date 01.08.2013
  *
  */
-public class NumberWithLabelElementComposite extends TextWithLabelComposite{
+public class CdmNumberField extends CdmTextField {
 
     private Float start;
     private Float end;
@@ -38,9 +38,8 @@ public class NumberWithLabelElementComposite extends TextWithLabelComposite{
      * @param initialInteger a {@link java.lang.Integer} object.
      * @param style a int.
      */
-    public NumberWithLabelElementComposite(Composite parent, FormToolkit formFactory, ICdmFormElement parentFormElement,
-            String labelString, Integer initialInteger, int style){
-        this(parent, formFactory, parentFormElement, labelString, new Float(initialInteger), style);
+    public CdmNumberField(Composite parent, FormToolkit formFactory, ICdmFormElement parentFormElement, Integer initialInteger, int style){
+        this(parent, formFactory, parentFormElement, new Float(initialInteger==null?0:initialInteger), style);
     }
 
     /**
@@ -53,10 +52,13 @@ public class NumberWithLabelElementComposite extends TextWithLabelComposite{
      * @param style a int.
      * @wbp.parser.constructor
      */
-    public NumberWithLabelElementComposite(Composite parent, FormToolkit formFactory,
-            ICdmFormElement parentElement, String labelString,
-            Float initialFloat, int style) {
-        super(parent, formFactory, parentElement, labelString, null, null, style);
+    public CdmNumberField(Composite parent, FormToolkit formFactory,
+            ICdmFormElement parentElement, Float initialFloat, int style) {
+        super(parent, formFactory, parentElement, null, null, style);
+        //WindowBuilder exception handling
+        if(initialFloat==null){
+            initialFloat = 0f;
+        }
         setFloat(initialFloat);
     }