diff flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartPropertiesEditor.java @ 1500:2a8b5dcbe8ca

Issue 358. Validate integer and double values in chart properties editor. flys-client/trunk@3625 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Raimund Renkert <raimund.renkert@intevation.de>
date Mon, 09 Jan 2012 09:17:52 +0000
parents cd8a146d29cd
children d12cb71965cf
line wrap: on
line diff
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartPropertiesEditor.java	Fri Jan 06 11:53:14 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartPropertiesEditor.java	Mon Jan 09 09:17:52 2012 +0000
@@ -24,11 +24,11 @@
 import com.smartgwt.client.widgets.events.ClickHandler;
 import com.smartgwt.client.widgets.form.fields.events.ChangedHandler;
 import com.smartgwt.client.widgets.form.fields.events.ChangedEvent;
+
 import com.smartgwt.client.types.Alignment;
 
 import de.intevation.flys.client.client.Config;
 import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.ui.OutputTab;
 import de.intevation.flys.client.shared.model.Property;
 import de.intevation.flys.client.shared.model.PropertyGroup;
 import de.intevation.flys.client.shared.model.PropertySetting;
@@ -36,9 +36,9 @@
 import de.intevation.flys.client.shared.model.DoubleProperty;
 import de.intevation.flys.client.shared.model.IntegerProperty;
 import de.intevation.flys.client.shared.model.StringProperty;
-import de.intevation.flys.client.shared.model.Settings;
 import de.intevation.flys.client.shared.model.OutputSettings;
 import de.intevation.flys.client.shared.model.Collection;
+import de.intevation.flys.client.client.utils.Validator;
 
 import de.intevation.flys.client.client.services.CollectionAttributeService;
 import de.intevation.flys.client.client.services.CollectionAttributeServiceAsync;
@@ -88,7 +88,7 @@
         setCanDragReposition(true);
         setCanDragResize(true);
 
-
+        Config config = Config.getInstance();
         collection = tab.getCollectionView().getCollection();
         String outputName = tab.getOutputName();
         settings = (OutputSettings)collection.getSettings(outputName);
@@ -135,7 +135,7 @@
 
         addItem(tabs);
         addItem(buttons);
-        setWidth(340);
+        setWidth(380);
         setHeight(470);
         centerInPage();
     }
@@ -172,16 +172,22 @@
             IntegerProperty fontsize =
                 (IntegerProperty)pg.getPropertyByName("font-size");
             FormItem fs = createIntegerProperty(fontsize);
+            fs.setAttribute("internalType", "integer");
+            fs.addChangedHandler(new Validator());
 
             DoubleProperty upper =
                 (DoubleProperty)pg.getPropertyByName("upper");
             final FormItem range1 = createDoubleProperty(upper);
-            range1.setWidth(50);
+            range1.setAttribute("internalType", "double");
+            range1.addChangedHandler(new Validator());
+            range1.setWidth(70);
 
             DoubleProperty lower =
                 (DoubleProperty)pg.getPropertyByName("lower");
             final FormItem range2 = createDoubleProperty(lower);
-            range2.setWidth(50);
+            range2.setAttribute("internalType", "double");
+            range2.addChangedHandler(new Validator());
+            range2.setWidth(70);
 
             BooleanProperty fixation =
                 (BooleanProperty)pg.getPropertyByName("fixation");
@@ -231,7 +237,7 @@
      *
      */
     protected DynamicForm generatePropertySetting(Property setting) {
-        final PropertySetting s = (PropertySetting)setting;
+        PropertySetting s = (PropertySetting)setting;
         DynamicForm form = new DynamicForm();
         FormItem item = new FormItem();
         if (setting instanceof BooleanProperty) {
@@ -239,9 +245,13 @@
         }
         else if (setting instanceof DoubleProperty) {
             item = createDoubleProperty((DoubleProperty)setting);
+            item.setAttribute("internalType", "double");
+            item.addChangedHandler(new Validator());
         }
         else if (setting instanceof IntegerProperty) {
             item = createIntegerProperty((IntegerProperty)setting);
+            item.setAttribute("internalType", "integer");
+            item.addChangedHandler(new Validator());
         }
         else if (setting instanceof StringProperty) {
             item = createStringProperty((StringProperty)setting);

http://dive4elements.wald.intevation.org