Mercurial > dive4elements > river
changeset 3802:e831dc29e572
Picked rev3186 from trunk.
flys-client/tags/pre2.6-2011-11-04@3187 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Tue, 08 Nov 2011 15:34:59 +0000 |
| parents | 4bb2736ee9bb |
| children | 881fcd01e056 |
| files | flys-client/ChangeLog flys-client/src/main/java/de/intevation/flys/client/client/ui/DistancePanel.java flys-client/src/main/java/de/intevation/flys/client/client/ui/SingleLocationPanel.java |
| diffstat | 3 files changed, 20 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-client/ChangeLog Fri Nov 04 11:45:00 2011 +0000 +++ b/flys-client/ChangeLog Tue Nov 08 15:34:59 2011 +0000 @@ -1,3 +1,11 @@ +2011-11-08 Ingo Weinzierl <ingo@intevation.de> + + * src/main/java/de/intevation/flys/client/client/ui/DistancePanel.java: + Set value "distance" for attribute "ld_mode". + + * src/main/java/de/intevation/flys/client/client/ui/SingleLocationPanel.java + Set value "locations" for attribute "ld_mode". + 2011-11-04 Ingo Weinzierl <ingo@intevation.de> * src/main/java/de/intevation/flys/client/client/FLYSConstants.properties:
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DistancePanel.java Fri Nov 04 11:45:00 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DistancePanel.java Tue Nov 08 15:34:59 2011 +0000 @@ -257,12 +257,16 @@ @Override public Data[] getData() { - Data[] data = new Data[3]; + Data[] data = new Data[4]; data[0] = getDataFrom(); data[1] = getDataTo(); data[2] = getDataStep(); + DataItem item = new DefaultDataItem("ld_mode","ld_mode", "distance"); + data[3] = new DefaultData( + "ld_mode", null, null, new DataItem[] { item }); + return data; }
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/SingleLocationPanel.java Fri Nov 04 11:45:00 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/SingleLocationPanel.java Tue Nov 08 15:34:59 2011 +0000 @@ -381,7 +381,7 @@ public Data[] getData() { saveLocationValues(locationPanel); double[] values = getLocationValues(); - Data[] data = new Data[values.length]; + Data[] data = new Data[values.length+1]; DataItem item = new DefaultDataItem(); for (int i = 0; i < values.length; i++) { item = new DefaultDataItem( @@ -394,6 +394,12 @@ null, new DataItem[] {item}); } + data[values.length] = new DefaultData( + "ld_mode", + null, null, + new DataItem[] { + new DefaultDataItem("ld_mode", "ld_mode", "locations") }); + return data; }