Mercurial > dive4elements > river
comparison flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartPropertiesEditor.java @ 1506:339f8aa641b5
Issue 358.
Convert strings for double values.
flys-client/trunk@3638 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Raimund Renkert <raimund.renkert@intevation.de> |
---|---|
date | Mon, 09 Jan 2012 18:06:01 +0000 |
parents | 4967508928a2 |
children | c21d14e48040 |
comparison
equal
deleted
inserted
replaced
1505:4967508928a2 | 1506:339f8aa641b5 |
---|---|
1 package de.intevation.flys.client.client.ui.chart; | 1 package de.intevation.flys.client.client.ui.chart; |
2 | 2 |
3 import java.util.List; | 3 import java.util.List; |
4 import java.util.Map; | |
4 | 5 |
5 import com.google.gwt.core.client.GWT; | 6 import com.google.gwt.core.client.GWT; |
6 import com.google.gwt.user.client.rpc.AsyncCallback; | 7 import com.google.gwt.user.client.rpc.AsyncCallback; |
7 | 8 |
8 import com.smartgwt.client.util.SC; | 9 import com.smartgwt.client.util.SC; |
166 | 167 |
167 /** | 168 /** |
168 * | 169 * |
169 */ | 170 */ |
170 protected Canvas generatePropertyGroup(Property group, Property orig) { | 171 protected Canvas generatePropertyGroup(Property group, Property orig) { |
172 Config config = Config.getInstance(); | |
173 String locale = config.getLocale(); | |
171 PropertyGroup pg = (PropertyGroup)group; | 174 PropertyGroup pg = (PropertyGroup)group; |
172 PropertyGroup origPg = (PropertyGroup)orig; | 175 PropertyGroup origPg = (PropertyGroup)orig; |
173 | 176 |
174 if (pg.getName().equals("axis")) { | 177 if (pg.getName().equals("axis")) { |
175 Label scale = new Label(MSG.scale() + " :"); | 178 Label scale = new Label(MSG.scale() + " :"); |
197 DoubleProperty upper = | 200 DoubleProperty upper = |
198 (DoubleProperty)pg.getPropertyByName("upper"); | 201 (DoubleProperty)pg.getPropertyByName("upper"); |
199 final FormItem range1 = createDoubleProperty(upper); | 202 final FormItem range1 = createDoubleProperty(upper); |
200 range1.addChangedHandler(new DoubleValidator()); | 203 range1.addChangedHandler(new DoubleValidator()); |
201 range1.setWidth(70); | 204 range1.setWidth(70); |
202 range1.setValue( | 205 String r1Value = |
203 ((DoubleProperty)origPg.getPropertyByName("upper")).getValue()); | 206 ((DoubleProperty)origPg.getPropertyByName("upper")).getValue(); |
204 | |
205 DoubleProperty lower = | 207 DoubleProperty lower = |
206 (DoubleProperty)pg.getPropertyByName("lower"); | 208 (DoubleProperty)pg.getPropertyByName("lower"); |
207 final FormItem range2 = createDoubleProperty(lower); | 209 final FormItem range2 = createDoubleProperty(lower); |
208 range2.addChangedHandler(new DoubleValidator()); | 210 range2.addChangedHandler(new DoubleValidator()); |
209 range2.setWidth(70); | 211 range2.setWidth(70); |
210 range2.setValue( | 212 String r2Value = |
211 ((DoubleProperty)origPg.getPropertyByName("lower")).getValue()); | 213 ((DoubleProperty)origPg.getPropertyByName("lower")).getValue(); |
214 if(locale.equals("de")) { | |
215 range1.setValue(r1Value.replaceAll("\\.", ",")); | |
216 range2.setValue(r2Value.replaceAll("\\.", ",")); | |
217 } | |
218 else { | |
219 range1.setValue(r1Value); | |
220 range2.setValue(r2Value); | |
221 } | |
212 | 222 |
213 BooleanProperty fixation = | 223 BooleanProperty fixation = |
214 (BooleanProperty)pg.getPropertyByName("fixation"); | 224 (BooleanProperty)pg.getPropertyByName("fixation"); |
215 FormItem fix = createBooleanProperty(fixation); | 225 FormItem fix = createBooleanProperty(fixation); |
216 String fixValue = | 226 String fixValue = |
283 item.setValue(false); | 293 item.setValue(false); |
284 } | 294 } |
285 } | 295 } |
286 else if (setting instanceof DoubleProperty) { | 296 else if (setting instanceof DoubleProperty) { |
287 item = createDoubleProperty((DoubleProperty)setting); | 297 item = createDoubleProperty((DoubleProperty)setting); |
288 item.addChangedHandler(new DoubleValidator()); | 298 DoubleValidator validator = new DoubleValidator(); |
289 item.setValue(((DoubleProperty)orig).getValue()); | 299 item.addChangedHandler(validator); |
300 Config config = Config.getInstance(); | |
301 String locale = config.getLocale(); | |
302 String iValue = ((DoubleProperty)orig).getValue(); | |
303 if(locale.equals("de")) { | |
304 item.setValue(iValue.replaceAll("\\.", ",")); | |
305 } | |
306 else { | |
307 item.setValue(iValue); | |
308 } | |
290 } | 309 } |
291 else if (setting instanceof IntegerProperty) { | 310 else if (setting instanceof IntegerProperty) { |
292 item = createIntegerProperty((IntegerProperty)setting); | 311 item = createIntegerProperty((IntegerProperty)setting); |
293 item.addChangedHandler(new IntegerValidator()); | 312 item.addChangedHandler(new IntegerValidator()); |
294 item.setValue(((IntegerProperty)orig).getValue()); | 313 item.setValue(((IntegerProperty)orig).getValue()); |
377 val = ""; | 396 val = ""; |
378 } | 397 } |
379 else { | 398 else { |
380 val = e.getValue().toString(); | 399 val = e.getValue().toString(); |
381 } | 400 } |
382 dp.setValue(val); | 401 DoubleValidator validator = new DoubleValidator(); |
402 | |
403 Map errors = e.getForm().getErrors(); | |
404 String input = validator.toProtocolString(e.getItem(), errors); | |
405 if(input != null) { | |
406 dp.setValue(input); | |
407 } | |
383 } | 408 } |
384 }); | 409 }); |
385 return item; | 410 return item; |
386 } | 411 } |
387 | 412 |