Mercurial > dive4elements > river
comparison flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartPropertiesEditor.java @ 2475:d77b1e489df7
Issue 492.
Validate axis scale in chart properties dialog.
flys-client/trunk@4214 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Wed, 11 Apr 2012 11:44:45 +0000 |
| parents | 1c47de6ccfb1 |
| children | 2867a0192aed |
comparison
equal
deleted
inserted
replaced
| 2474:6f7e188fac1a | 2475:d77b1e489df7 |
|---|---|
| 199 origPg.getPropertyByName("font-size")).getValue()); | 199 origPg.getPropertyByName("font-size")).getValue()); |
| 200 | 200 |
| 201 DoubleProperty upper = | 201 DoubleProperty upper = |
| 202 (DoubleProperty)pg.getPropertyByName("upper"); | 202 (DoubleProperty)pg.getPropertyByName("upper"); |
| 203 final FormItem range1 = createDoubleProperty(upper); | 203 final FormItem range1 = createDoubleProperty(upper); |
| 204 range1.setName("rangeupper"); | |
| 204 range1.setWidth(70); | 205 range1.setWidth(70); |
| 205 range1.setValue( | 206 range1.setValue( |
| 206 ((DoubleProperty) | 207 ((DoubleProperty) |
| 207 origPg.getPropertyByName("upper")).toUIString()); | 208 origPg.getPropertyByName("upper")).toUIString()); |
| 208 | 209 |
| 209 DoubleProperty lower = | 210 DoubleProperty lower = |
| 210 (DoubleProperty)pg.getPropertyByName("lower"); | 211 (DoubleProperty)pg.getPropertyByName("lower"); |
| 211 final FormItem range2 = createDoubleProperty(lower); | 212 final FormItem range2 = createDoubleProperty(lower); |
| 213 range2.setName("rangelower"); | |
| 212 range2.setWidth(70); | 214 range2.setWidth(70); |
| 213 range2.setValue( | 215 range2.setValue( |
| 214 ((DoubleProperty) | 216 ((DoubleProperty) |
| 215 origPg.getPropertyByName("lower")).toUIString()); | 217 origPg.getPropertyByName("lower")).toUIString()); |
| 216 | 218 |
| 451 | 453 |
| 452 protected boolean validateCanvas(Canvas c) { | 454 protected boolean validateCanvas(Canvas c) { |
| 453 boolean valid = true; | 455 boolean valid = true; |
| 454 if(c instanceof DynamicForm) { | 456 if(c instanceof DynamicForm) { |
| 455 DynamicForm f = (DynamicForm) c; | 457 DynamicForm f = (DynamicForm) c; |
| 458 FormItem up = f.getItem("rangeupper"); | |
| 459 FormItem lo = f.getItem("rangelower"); | |
| 460 | |
| 461 if(up != null && lo != null && | |
| 462 !up.isDisabled() && !lo.isDisabled()) | |
| 463 { | |
| 464 validateRange(f); | |
| 465 } | |
| 456 return !f.hasErrors(); | 466 return !f.hasErrors(); |
| 457 } | 467 } |
| 458 else if(c.getChildren().length > 0) { | 468 else if(c.getChildren().length > 0) { |
| 459 for (Canvas child: c.getChildren()) { | 469 for (Canvas child: c.getChildren()) { |
| 460 valid = validateCanvas(child); | 470 valid = validateCanvas(child); |
| 463 } | 473 } |
| 464 } | 474 } |
| 465 } | 475 } |
| 466 return valid; | 476 return valid; |
| 467 } | 477 } |
| 478 | |
| 479 protected boolean validateRange(DynamicForm form) { | |
| 480 Map errors = form.getErrors(); | |
| 481 FormItem up = form.getItem("rangeupper"); | |
| 482 FormItem lo = form.getItem("rangelower"); | |
| 483 | |
| 484 String v1 = up.getValue().toString(); | |
| 485 String v2 = lo.getValue().toString(); | |
| 486 | |
| 487 if(v1.equals(v2)) { | |
| 488 errors.put(up.getFieldName(), MSG.wrongFormat()); | |
| 489 errors.put(lo.getFieldName(), MSG.wrongFormat()); | |
| 490 form.setErrors(errors, true); | |
| 491 return false; | |
| 492 } | |
| 493 return true; | |
| 494 } | |
| 468 } | 495 } |
| 469 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : | 496 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : |