Mercurial > dive4elements > river
comparison flys-client/src/main/java/de/intevation/flys/client/shared/model/DefaultGaugeInfo.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 | 4e33aa341e51 |
children | 22cd60315e08 |
comparison
equal
deleted
inserted
replaced
3718:1598d324fbc2 | 3719:e82acd5c86f7 |
---|---|
13 private Double minq; | 13 private Double minq; |
14 private Double maxq; | 14 private Double maxq; |
15 private Double minw; | 15 private Double minw; |
16 private Double maxw; | 16 private Double maxw; |
17 private boolean kmup; | 17 private boolean kmup; |
18 private Double station; | |
19 private String wstunit; | |
18 | 20 |
19 public DefaultGaugeInfo() { | 21 public DefaultGaugeInfo() { |
20 } | 22 } |
21 | 23 |
22 public DefaultGaugeInfo( | 24 public DefaultGaugeInfo( |
23 String name, | 25 String name, |
24 boolean kmup, | 26 boolean kmup, |
27 Double station, | |
25 Double start, | 28 Double start, |
26 Double end, | 29 Double end, |
27 Double datum, | 30 Double datum, |
28 Double aeo, | 31 Double aeo, |
29 Double minq, | 32 Double minq, |
30 Double maxq, | 33 Double maxq, |
31 Double minw, | 34 Double minw, |
32 Double maxw) | 35 Double maxw, |
36 String wstunit) | |
33 { | 37 { |
34 this.name = name; | 38 this.name = name; |
35 this.start = start; | 39 this.station = station; |
36 this.end = end; | 40 this.start = start; |
37 this.datum = datum; | 41 this.end = end; |
38 this.aeo = aeo; | 42 this.datum = datum; |
39 this.minq = minq; | 43 this.aeo = aeo; |
40 this.maxq = maxq; | 44 this.minq = minq; |
41 this.minw = minw; | 45 this.maxq = maxq; |
42 this.maxw = maxw; | 46 this.minw = minw; |
47 this.maxw = maxw; | |
48 this.wstunit = wstunit; | |
43 } | 49 } |
44 /** | 50 /** |
45 * Returns the name of the gauge | 51 * Returns the name of the gauge |
46 */ | 52 */ |
47 public String getName() { | 53 public String getName() { |
105 } | 111 } |
106 | 112 |
107 public boolean isKmUp() { | 113 public boolean isKmUp() { |
108 return this.kmup; | 114 return this.kmup; |
109 } | 115 } |
116 | |
117 /** | |
118 * Returns the station km of the gauge or null if not available | |
119 */ | |
120 public Double getStation() { | |
121 return this.station; | |
122 } | |
123 | |
124 /** | |
125 * Returns the wst unit as a String | |
126 */ | |
127 public String getWstUnit() { | |
128 return this.wstunit; | |
129 } | |
110 } | 130 } |