Mercurial > dive4elements > river
changeset 3057:febc39e77672
Make it compilable again
flys-artifacts/trunk@4633 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Mon, 11 Jun 2012 09:58:54 +0000 |
| parents | 0b5a7a2c3724 |
| children | df4d6b286af8 |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Parameters.java flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java |
| diffstat | 3 files changed, 16 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Sun Jun 10 11:12:38 2012 +0000 +++ b/flys-artifacts/ChangeLog Mon Jun 11 09:58:54 2012 +0000 @@ -1,3 +1,11 @@ +2012-06-11 Sascha L. Teichmann <sascha.teihmann@intevation.de> + + * src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: + Fixed broken logger class. + + * src/main/java/de/intevation/flys/artifacts/model/Parameters.java: + Re-establish old indentation. + 2012-06-07 Felix Wolfsteller <felix.wolfsteller@intevation.de> * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java:
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Parameters.java Sun Jun 10 11:12:38 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Parameters.java Mon Jun 11 09:58:54 2012 +0000 @@ -34,7 +34,9 @@ return i; } } - log.debug("columnIndex: " + name + " not found in columnNames"); + if (log.isDebugEnabled()) { + log.debug("columnIndex: " + name + " not found in columnNames"); + } return -1; } @@ -137,8 +139,7 @@ } public int binarySearch(int columnIndex, double value, double epsilon) { - if (epsilon < 0d) - epsilon = -epsilon; + if (epsilon < 0d) epsilon = -epsilon; double vl = value - epsilon; double vh = value + epsilon; @@ -147,12 +148,9 @@ while (hi >= lo) { int mid = (lo + hi) >> 1; double v = column.getQuick(mid); - if (v < vl) - hi = mid - 1; - else if (v > vh) - lo = mid + 1; - else - return mid; + if (v < vl) hi = mid - 1; + else if (v > vh) lo = mid + 1; + else return mid; } return -1;
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java Sun Jun 10 11:12:38 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java Mon Jun 11 09:58:54 2012 +0000 @@ -22,7 +22,7 @@ implements FacetTypes { private static Logger logger = - Logger.getLogger(FixWQChartGenerator.class); + Logger.getLogger(FixWQCurveGenerator.class); public static final String I18N_CHART_TITLE = "chart.fixings.wq.title";