Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQSelect.java @ 2164:d548e2e13524
Added code for the simple case of "Bezugslinienverfahren" ("W auf freier Strecke").
flys-artifacts/trunk@3752 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Mon, 23 Jan 2012 16:55:42 +0000 |
parents | 48fd8b06bce5 |
children | 22bac691d414 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQSelect.java Mon Jan 23 14:18:53 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQSelect.java Mon Jan 23 16:55:42 2012 +0000 @@ -102,7 +102,7 @@ Element itemElement = creator.create("item"); creator.addAttr(itemElement, "value", value, true); - String label = ""; + String label; if (mode == null || mode.equals("W") || Boolean.valueOf(free)) { label = getLabel(winfo, cc, value); @@ -125,25 +125,33 @@ String raw ) { String[] values = raw.split(" "); - String label = null; + + if (values.length < 1) { + return null; + } + + StringBuilder label = new StringBuilder(); NumberFormat nf = NumberFormat.getInstance( Resources.getLocale(cc.getMeta())); for (String value: values) { try { - double v = Double.valueOf(value.trim()); + double v = Double.parseDouble(value.trim()); String formatted = nf.format(v); - label = label != null ? label + ";" + formatted : formatted; + if (label.length() > 0) { + label.append(';'); + } + label.append(formatted); } catch (NumberFormatException nfe) { // do nothing here } } - return label; + return label.toString(); } @@ -153,34 +161,44 @@ String raw ) { String[] values = raw.split(" "); - String label = null; + + if (values.length < 1) { + return null; + } NumberFormat nf = NumberFormat.getInstance( Resources.getLocale(cc.getMeta())); + Gauge gauge = winfo.getGauge(); + + boolean debug = logger.isDebugEnabled(); + + StringBuilder label = new StringBuilder(); + for (String value: values) { try { - double v = Double.valueOf(value.trim()); + double v = Double.parseDouble(value.trim()); String tmp = nf.format(v); - String mv = FLYSUtils.getNamedMainValue(winfo.getGauge(),v); + String mv = FLYSUtils.getNamedMainValue(gauge, v); if (mv != null && mv.length() > 0) { - String add = mv + ": " + tmp; - logger.debug("Add main value: '" + mv + "'"); - label = label != null ? label + ";" + add : add; + tmp = mv + ": " + tmp; + if (debug) { + logger.debug("Add main value: '" + mv + "'"); + } } - else { - logger.debug("Add non main value: '" + tmp + "'"); - label = label != null ? label + ";" + tmp : tmp; + if (label.length() > 0) { + label.append(';'); } + label.append(tmp); } catch (NumberFormatException nfe) { // do nothing here } } - return label; + return label.toString(); }