Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQSelect.java @ 2030:355495661a1c
Changed the seperator character between Ws and Qs in the Artifact's DESCRIBE document.
flys-artifacts/trunk@3492 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Tue, 20 Dec 2011 11:48:24 +0000 |
| parents | 6762f54b23b1 |
| children | 522826b41ffa |
comparison
equal
deleted
inserted
replaced
| 2029:131842fc6581 | 2030:355495661a1c |
|---|---|
| 131 try { | 131 try { |
| 132 double v = Double.valueOf(value.trim()); | 132 double v = Double.valueOf(value.trim()); |
| 133 | 133 |
| 134 String formatted = nf.format(v); | 134 String formatted = nf.format(v); |
| 135 | 135 |
| 136 label = label != null ? label + " " + formatted : formatted; | 136 label = label != null ? label + ";" + formatted : formatted; |
| 137 } | 137 } |
| 138 catch (NumberFormatException nfe) { | 138 catch (NumberFormatException nfe) { |
| 139 // do nothing here | 139 // do nothing here |
| 140 } | 140 } |
| 141 } | 141 } |
| 163 String mv = FLYSUtils.getNamedMainValue(winfo.getGauge(),v); | 163 String mv = FLYSUtils.getNamedMainValue(winfo.getGauge(),v); |
| 164 | 164 |
| 165 if (mv != null && mv.length() > 0) { | 165 if (mv != null && mv.length() > 0) { |
| 166 String add = mv + ": " + tmp; | 166 String add = mv + ": " + tmp; |
| 167 logger.debug("Add main value: '" + mv + "'"); | 167 logger.debug("Add main value: '" + mv + "'"); |
| 168 label = label != null ? label + " " + add : add; | 168 label = label != null ? label + ";" + add : add; |
| 169 } | 169 } |
| 170 else { | 170 else { |
| 171 logger.debug("Add non main value: '" + tmp + "'"); | 171 logger.debug("Add non main value: '" + tmp + "'"); |
| 172 label = label != null ? label + " " + tmp : tmp; | 172 label = label != null ? label + ";" + tmp : tmp; |
| 173 } | 173 } |
| 174 } | 174 } |
| 175 catch (NumberFormatException nfe) { | 175 catch (NumberFormatException nfe) { |
| 176 // do nothing here | 176 // do nothing here |
| 177 } | 177 } |