Mercurial > dive4elements > river
changeset 1423:204e085a9f1c
Bugfix: set correct label for 'waterlevel/ground' state.
flys-client/trunk@3365 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Thu, 08 Dec 2011 07:05:09 +0000 |
| parents | 25be27e33b77 |
| children | 8974e220b193 |
| files | flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties flys-client/src/main/java/de/intevation/flys/client/client/ui/DistancePanel.java flys-client/src/main/java/de/intevation/flys/client/client/ui/WaterlevelGroundPanel.java |
| diffstat | 6 files changed, 17 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Thu Dec 08 06:51:20 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Thu Dec 08 07:05:09 2011 +0000 @@ -118,6 +118,8 @@ String distance_state(); + String waterlevel_ground_state(); + String location(); String locations();
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Thu Dec 08 06:51:20 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Thu Dec 08 07:05:09 2011 +0000 @@ -40,6 +40,7 @@ next = Next location_distance_state = Choose calculation location(s) / range [km] distance_state = Choose calculation range [km] +waterlevel_ground_state = Choose differences betweeen waterlevel and ground [m] location = Location(s) locations = Locations distance = Range
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Thu Dec 08 06:51:20 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Thu Dec 08 07:05:09 2011 +0000 @@ -40,6 +40,7 @@ next = Weiter location_distance_state = Berechnungsort(e) / strecke w\u00e4hlen [km] distance_state = Berechnungsstrecke w\u00e4hlen [km] +waterlevel_ground_state = Differenzen zwischen Wasserspiegel und Gel\u00e4nde [m] location = Ort(e) locations = Orte distance = Strecke
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Thu Dec 08 06:51:20 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Thu Dec 08 07:05:09 2011 +0000 @@ -40,6 +40,7 @@ next = Next location_distance_state = Choose calculation location(s) / range [km] distance_state = Choose calculation range [km] +waterlevel_ground_state = Choose differences betweeen waterlevel and ground [m] location = Location(s) locations = Locations distance = Range
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DistancePanel.java Thu Dec 08 06:51:20 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DistancePanel.java Thu Dec 08 07:05:09 2011 +0000 @@ -82,7 +82,7 @@ VLayout layout = new VLayout(); layout.setMembersMargin(10); - Label label = new Label(MSG.distance_state()); + Label label = new Label(getLabel()); Canvas submit = getNextButton(); @@ -146,6 +146,11 @@ } + protected String getLabel() { + return MSG.distance_state(); + } + + protected String labelFrom() { return getLabelFrom() + " [" + getUnitFrom() + "]"; }
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/WaterlevelGroundPanel.java Thu Dec 08 06:51:20 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/WaterlevelGroundPanel.java Thu Dec 08 07:05:09 2011 +0000 @@ -31,6 +31,12 @@ @Override + protected String getLabel() { + return MSG.waterlevel_ground_state(); + } + + + @Override protected String labelFrom() { return getLabelFrom() + " [" + getUnitFrom() + "]"; }