merged/implemented cdm3.3 model adaptations

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

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElement.java
index 755ecd3b10e39a60363c0b39f5f95b8d6bae6b77..d441b0b2fe51f9fabbfab3d6d0abad4cc0f09e3c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElement.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.
 */
@@ -15,6 +15,7 @@ import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.widgets.Display;
 
 import eu.etaxonomy.cdm.common.CdmUtils;
+import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement;
 
 
 /**
@@ -28,7 +29,7 @@ public class NumberWithLabelElement extends TextWithLabelElement {
 
        private Float start;
        private Float end;
-       
+
        private NumberFormatException exception;
 
        /**
@@ -46,8 +47,8 @@ public class NumberWithLabelElement extends TextWithLabelElement {
                super(toolkit, parentElement, labelString, null, null, style);
                setNumber(initialNumber);
        }
-       
-       
+
+
        /**
         * <p>setNumber</p>
         *
@@ -56,7 +57,7 @@ public class NumberWithLabelElement extends TextWithLabelElement {
        public void setNumber(Number number) {
                super.setText(getStringRepresentation(number));
        }
-       
+
        /**
         * <p>getInteger</p>
         *
@@ -66,7 +67,7 @@ public class NumberWithLabelElement extends TextWithLabelElement {
                String text = super.getText().trim();
                return text.equals("") ? 0 : new Integer(text);
        }
-       
+
        /**
         * <p>getFloat</p>
         *
@@ -76,7 +77,7 @@ public class NumberWithLabelElement extends TextWithLabelElement {
                String text = super.getText();
                return new Float(text);
        }
-       
+
        /**
         * <p>getDouble</p>
         *
@@ -90,10 +91,10 @@ public class NumberWithLabelElement extends TextWithLabelElement {
        private String getStringRepresentation(Object number){
                if(number != null){
                        return number.toString();
-               }               
+               }
                return null;
        }
-       
+
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.forms.AbstractCdmFormElement#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
         */
@@ -105,27 +106,28 @@ public class NumberWithLabelElement extends TextWithLabelElement {
                        text.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
                        return;
                }
-               
+
                try{
-                       
+
                        Float number = Float.parseFloat(value);
-                       
+
                        if((start != null && number < start) || (end != null && number > end)){
                                throw new NumberFormatException("You entered a number that is not within the allowed bounds.");
                        }
-                       
+
                }catch(NumberFormatException e){
                        text.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
                        firePropertyChangeEvent(new CdmPropertyChangeEvent(this, e));
+                       exception = e;
                        return;
                }
-               
+
                exception = null;
                text.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
-               
+
                super.modifyText(event);
        }
-       
+
        /**
         * <p>setLimits</p>
         *
@@ -136,7 +138,7 @@ public class NumberWithLabelElement extends TextWithLabelElement {
        public void setLimits(int numberOfDigits, Integer start, Integer end){
                setLimits(numberOfDigits, start.floatValue(), end.floatValue());
        }
-       
+
        /**
         * <p>setLimits</p>
         *
@@ -149,7 +151,7 @@ public class NumberWithLabelElement extends TextWithLabelElement {
                this.start = start;
                this.end = end;
        }
-       
+
        /**
         * <p>Getter for the field <code>exception</code>.</p>
         *