# HG changeset patch # User Felix Wolfsteller # Date 1348752351 0 # Node ID 208a891c21b54bb4423c6b16539ec0467065aea9 # Parent e20307be4cc3562d7714369abcbd0a3ae0332da1 Partly fix issue871. flys-artifacts/trunk@5619 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r e20307be4cc3 -r 208a891c21b5 flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Thu Sep 27 12:58:55 2012 +0000 +++ b/flys-artifacts/ChangeLog Thu Sep 27 13:25:51 2012 +0000 @@ -1,3 +1,10 @@ +2012-09-27 Felix Wolfsteller + + Fix part of issue871 (selected flow-veloc- parameter shown wrong). + + * src/main/java/de/intevation/flys/artifacts/states/DischargeState.java: + Fix conditional. + 2012-09-27 Felix Wolfsteller Fix issue863 (gaps in middle height bed data). diff -r e20307be4cc3 -r 208a891c21b5 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DischargeState.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DischargeState.java Thu Sep 27 12:58:55 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DischargeState.java Thu Sep 27 13:25:51 2012 +0000 @@ -25,6 +25,7 @@ private static final Logger logger = Logger.getLogger(DischargeState.class); + /** Let client display a matrix. */ @Override public String getUIProvider() { return "parameter-matrix"; @@ -99,7 +100,7 @@ String lo = zone.getLowerDischarge(); String hi = zone.getUpperDischarge(); - return hi != null && lo.equals(hi) + return hi != null && !lo.equals(hi) ? lo + " - " + hi : lo; }