merge-update of trunk and disabling GUI-Control separation

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

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MinMaxTextSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MinMaxTextSection.java
index 6b9c75458fc267c45f4edf8dfe82130a4ec02a41..723b795c49dd6cc0d27c27ac898d29f8cfbe520a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MinMaxTextSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MinMaxTextSection.java
@@ -60,12 +60,16 @@ public class MinMaxTextSection extends AbstractFormSection<DerivedUnitFacade> {
                this.unitType = unitType;
                getLayoutComposite().setLayout(LayoutConstants.LAYOUT(2, false));
 
-               text_minVal = formFactory.createNumberTextWithLabelElement(this,
-                               "Min : ", getMinimum(), style);
-
-               text_maxVal = formFactory.createNumberTextWithLabelElement(this,
-                               "Max : ", getMaximum(), style);
-
+               switch(unitType) {
+                       case ELEVATION:
+                               text_minVal = formFactory.createNumberTextWithLabelElement(this, "Min [m] : ", getMinimum(), style);
+                               text_maxVal = formFactory.createNumberTextWithLabelElement(this, "Max [m] : ", getMaximum(), style);    
+                               break;
+                       default:
+                               text_minVal = formFactory.createNumberTextWithLabelElement(this, "Min [m] : ", getMinimum(), style);
+                               text_maxVal = formFactory.createNumberTextWithLabelElement(this, "Max [m] : ", getMaximum(), style);                                                            
+                               break;                  
+               }
                text_freeText = formFactory.createTextWithLabelElement(this,
                                "Freetext : ", getFreetext(), style);
 
@@ -183,7 +187,7 @@ public class MinMaxTextSection extends AbstractFormSection<DerivedUnitFacade> {
        private void updateMinimum() {
                switch(unitType) {
                case ELEVATION:
-                       getEntity().setAbsoluteElevation(text_minVal.getInteger());
+                       getEntity().setAbsoluteElevation(text_minVal.getDouble().intValue());
                        break;
                case DIST_TO_GROUND:
                        getEntity().setDistanceToGround(text_minVal.getDouble());
@@ -212,7 +216,7 @@ public class MinMaxTextSection extends AbstractFormSection<DerivedUnitFacade> {
        private void updateMaximum() {
                switch(unitType) {
                case ELEVATION:
-                       getEntity().setAbsoluteElevationMax(text_maxVal.getInteger());
+                       getEntity().setAbsoluteElevationMax(text_maxVal.getDouble().intValue());
                        break;
                case DIST_TO_GROUND:
                        getEntity().setDistanceToGroundMax(text_maxVal.getDouble());