Mercurial > dive4elements > river
changeset 3864:c434dd2e84cf
Add the river name to the gaugeinfo
flys-client/trunk@5638 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Bjoern Ricks <bjoern.ricks@intevation.de> |
|---|---|
| date | Fri, 28 Sep 2012 08:52:53 +0000 |
| parents | 4f0b95845aef |
| children | 436eec3be6ff |
| files | flys-client/ChangeLog flys-client/src/main/java/de/intevation/flys/client/server/GaugeOverviewInfoServiceImpl.java flys-client/src/main/java/de/intevation/flys/client/shared/model/DefaultGaugeInfo.java flys-client/src/main/java/de/intevation/flys/client/shared/model/GaugeInfo.java |
| diffstat | 4 files changed, 23 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-client/ChangeLog Thu Sep 27 18:31:03 2012 +0000 +++ b/flys-client/ChangeLog Fri Sep 28 08:52:53 2012 +0000 @@ -1,3 +1,10 @@ +2012-09-29 Björn Ricks <bjoern.ricks@intevation.de> + + * src/main/java/de/intevation/flys/client/shared/model/DefaultGaugeInfo.java, + src/main/java/de/intevation/flys/client/shared/model/GaugeInfo.java, + src/main/java/de/intevation/flys/client/server/GaugeOverviewInfoServiceImpl.java: + Add river name to the GaugeInfo + 2012-09-27 Felix Wolfsteller <felix.wolfsteller@intevation.de> Work on issue724 (i18n in minfo).
--- a/flys-client/src/main/java/de/intevation/flys/client/server/GaugeOverviewInfoServiceImpl.java Thu Sep 27 18:31:03 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/GaugeOverviewInfoServiceImpl.java Fri Sep 28 08:52:53 2012 +0000 @@ -133,6 +133,7 @@ logger.debug("Found gauge with name " + gname); GaugeInfo gaugeinfo = new DefaultGaugeInfo( + rname, gname, kmup, parseDouble(gstation),
--- a/flys-client/src/main/java/de/intevation/flys/client/shared/model/DefaultGaugeInfo.java Thu Sep 27 18:31:03 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/shared/model/DefaultGaugeInfo.java Fri Sep 28 08:52:53 2012 +0000 @@ -18,11 +18,13 @@ private Double station; private String wstunit; private Long officialnumber; + private String rivername; public DefaultGaugeInfo() { } public DefaultGaugeInfo( + String rivername, String name, boolean kmup, Double station, @@ -37,6 +39,7 @@ String wstunit, Long official) { + this.rivername = rivername; this.name = name; this.kmup = kmup; this.station = station; @@ -138,4 +141,11 @@ public Long getOfficialNumber() { return this.officialnumber; } + + /** + * Returns the river to which this gauge belongs + */ + public String getRiverName() { + return this.rivername; + } }
--- a/flys-client/src/main/java/de/intevation/flys/client/shared/model/GaugeInfo.java Thu Sep 27 18:31:03 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/shared/model/GaugeInfo.java Fri Sep 28 08:52:53 2012 +0000 @@ -68,4 +68,9 @@ * Returns the official number of this gauge */ Long getOfficialNumber(); + + /** + * Returns the river to which this gauge belongs + */ + String getRiverName(); }