Mercurial > dive4elements > river
comparison flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationDistancePanel.java @ 517:ec965bf8dfef
Take care on empty Data objects while initializing default values in Location/distance panel.
flys-client/trunk@1989 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Tue, 24 May 2011 11:21:11 +0000 |
| parents | ba606e575663 |
| children | 9e2b151770bd |
comparison
equal
deleted
inserted
replaced
| 516:ba606e575663 | 517:ec965bf8dfef |
|---|---|
| 463 DataItem lDef = l.getDefault(); | 463 DataItem lDef = l.getDefault(); |
| 464 DataItem fDef = f.getDefault(); | 464 DataItem fDef = f.getDefault(); |
| 465 DataItem tDef = t.getDefault(); | 465 DataItem tDef = t.getDefault(); |
| 466 DataItem sDef = s.getDefault(); | 466 DataItem sDef = s.getDefault(); |
| 467 | 467 |
| 468 String theMode = mDef != null | 468 String mDefValue = mDef != null ? mDef.getStringValue() : null; |
| 469 String theMode = mDefValue != null && mDefValue.length() > 0 | |
| 469 ? mDef.getStringValue() | 470 ? mDef.getStringValue() |
| 470 : FIELD_VALUE_LOCATION; | 471 : FIELD_VALUE_LOCATION; |
| 471 | 472 |
| 472 mode.setValue(FIELD_MODE, theMode); | 473 mode.setValue(FIELD_MODE, theMode); |
| 473 | 474 |
| 474 setFrom(fDef != null | 475 String fDefValue = fDef != null ? fDef.getStringValue() : null; |
| 476 setFrom(fDefValue != null && fDefValue.length() > 0 | |
| 475 ? Double.valueOf(fDef.getStringValue()) | 477 ? Double.valueOf(fDef.getStringValue()) |
| 476 : min); | 478 : min); |
| 477 | 479 |
| 478 setTo(tDef != null | 480 String tDefValue = tDef != null ? tDef.getStringValue() : null; |
| 481 setTo(tDefValue != null && tDefValue.length() > 0 | |
| 479 ? Double.valueOf(tDef.getStringValue()) | 482 ? Double.valueOf(tDef.getStringValue()) |
| 480 : max); | 483 : max); |
| 481 | 484 |
| 482 setStep(sDef != null | 485 String sDefValue = sDef != null ? sDef.getStringValue() : null; |
| 486 setStep(sDefValue != null && sDefValue.length() > 0 | |
| 483 ? Double.valueOf(sDef.getStringValue()) | 487 ? Double.valueOf(sDef.getStringValue()) |
| 484 : step); | 488 : step); |
| 485 | 489 |
| 486 if (lDef != null) { | 490 if (lDef != null) { |
| 487 setLocationValues(lDef.getStringValue()); | 491 String lDefValue = lDef != null ? lDef.getStringValue() : null; |
| 492 | |
| 493 if (lDefValue != null && lDefValue.length() > 0) { | |
| 494 setLocationValues(lDef.getStringValue()); | |
| 495 } | |
| 488 } | 496 } |
| 489 | 497 |
| 490 if (theMode.equals(FIELD_VALUE_DISTANCE)) { | 498 if (theMode.equals(FIELD_VALUE_DISTANCE)) { |
| 491 enableDistancePanel(); | 499 enableDistancePanel(); |
| 492 } | 500 } |