Mercurial > dive4elements > river
comparison flys-client/src/main/java/de/intevation/flys/client/server/GaugeOverviewInfoServiceImpl.java @ 3719:e82acd5c86f7
Merged revisions 5495-5496,5509,5514-5515,5521-5526 via svnmerge from
file:///home/clients/bsh/bsh-generischer-viewer/Material/SVN/flys-client/trunk
........
r5495 | ingo | 2012-09-17 14:55:09 +0200 (Mo, 17 Sep 2012) | 1 line
Added missing i18n strings for minfo state description.
........
r5496 | ingo | 2012-09-17 15:47:43 +0200 (Mo, 17 Sep 2012) | 1 line
Tagged 'flys-client' as 2.9.1
........
r5509 | teichmann | 2012-09-18 17:54:37 +0200 (Di, 18 Sep 2012) | 1 line
Removed trailing whitespace.
........
r5514 | bricks | 2012-09-19 09:56:42 +0200 (Mi, 19 Sep 2012) | 2 lines
Add missing Changelog entry for r5472
........
r5515 | bricks | 2012-09-19 09:59:35 +0200 (Mi, 19 Sep 2012) | 2 lines
Implement a scrolling gauge info tree
........
r5521 | bricks | 2012-09-19 14:41:48 +0200 (Mi, 19 Sep 2012) | 2 lines
Add station info to the gauges
........
r5522 | bricks | 2012-09-19 14:43:43 +0200 (Mi, 19 Sep 2012) | 2 lines
Improve the handling of the GaugePanel in the ParameterList
........
r5523 | bricks | 2012-09-19 14:51:02 +0200 (Mi, 19 Sep 2012) | 4 lines
Improve the GaugePanel
Be locale aware and only load the gauge info if the river name changes.
........
r5524 | bricks | 2012-09-19 15:14:46 +0200 (Mi, 19 Sep 2012) | 5 lines
Fix a NullPointerException
When iterating over a list it must be checked if the reference to the list is
valid.
........
r5525 | bricks | 2012-09-19 15:16:24 +0200 (Mi, 19 Sep 2012) | 2 lines
Don't display the GaugePanel if no river is selected
........
r5526 | bricks | 2012-09-19 15:18:36 +0200 (Mi, 19 Sep 2012) | 2 lines
Use the wstunit from the river as unit for the Pegelnullpunkt
........
flys-client/tags/2.9.1@5528 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Wed, 19 Sep 2012 14:42:48 +0000 |
| parents | 79ad33f41977 |
| children | 22cd60315e08 |
comparison
equal
deleted
inserted
replaced
| 3718:1598d324fbc2 | 3719:e82acd5c86f7 |
|---|---|
| 121 ArtifactNamespaceContext.NAMESPACE_URI, "minw"); | 121 ArtifactNamespaceContext.NAMESPACE_URI, "minw"); |
| 122 String gmaxq = gaugeele.getAttributeNS( | 122 String gmaxq = gaugeele.getAttributeNS( |
| 123 ArtifactNamespaceContext.NAMESPACE_URI, "maxq"); | 123 ArtifactNamespaceContext.NAMESPACE_URI, "maxq"); |
| 124 String gmaxw = gaugeele.getAttributeNS( | 124 String gmaxw = gaugeele.getAttributeNS( |
| 125 ArtifactNamespaceContext.NAMESPACE_URI, "maxw"); | 125 ArtifactNamespaceContext.NAMESPACE_URI, "maxw"); |
| 126 String gstation = gaugeele.getAttributeNS( | |
| 127 ArtifactNamespaceContext.NAMESPACE_URI, "station"); | |
| 126 | 128 |
| 127 logger.debug("Found gauge with name " + gname); | 129 logger.debug("Found gauge with name " + gname); |
| 128 | 130 |
| 129 GaugeInfo gaugeinfo = new DefaultGaugeInfo( | 131 GaugeInfo gaugeinfo = new DefaultGaugeInfo( |
| 130 gname, | 132 gname, |
| 131 kmup, | 133 kmup, |
| 134 parseDouble(gstation), | |
| 132 parseDouble(gstart), | 135 parseDouble(gstart), |
| 133 parseDouble(gend), | 136 parseDouble(gend), |
| 134 parseDouble(gdatum), | 137 parseDouble(gdatum), |
| 135 parseDouble(gaeo), | 138 parseDouble(gaeo), |
| 136 parseDouble(gminq), | 139 parseDouble(gminq), |
| 137 parseDouble(gmaxq), | 140 parseDouble(gmaxq), |
| 138 parseDouble(gminw), | 141 parseDouble(gminw), |
| 139 parseDouble(gmaxw) | 142 parseDouble(gmaxw), |
| 143 rwstunit | |
| 140 ); | 144 ); |
| 141 | 145 |
| 142 gauges.add(gaugeinfo); | 146 gauges.add(gaugeinfo); |
| 143 } | 147 } |
| 144 } | 148 } |