Mercurial > dive4elements > river
changeset 7883:fc8d5b5f2c99
Removed trailing whitespace.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Fri, 16 May 2014 17:10:10 +0200 |
| parents | 4534659e200e |
| children | a97b2926de5e |
| files | backend/src/main/java/org/dive4elements/river/importer/parsers/WaterlevelDifferencesParser.java backend/src/main/java/org/dive4elements/river/importer/parsers/WaterlevelParser.java backend/src/main/java/org/dive4elements/river/importer/parsers/WstParser.java |
| diffstat | 3 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/WaterlevelDifferencesParser.java Fri May 16 14:57:46 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/WaterlevelDifferencesParser.java Fri May 16 17:10:10 2014 +0200 @@ -102,8 +102,8 @@ // For all differences columns, add a single Q-Range with // -1. // Expand range to minimal length in case it would be 0 - // TODO: should otherwise be extended to - // (first station of next range - INTERVAL_GAP), + // TODO: should otherwise be extended to + // (first station of next range - INTERVAL_GAP), // assuming always ascending stations for (ImportWstColumn column: columns) { List<ImportWstColumnValue> cValues = column.getColumnValues();
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/WaterlevelParser.java Fri May 16 14:57:46 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/WaterlevelParser.java Fri May 16 17:10:10 2014 +0200 @@ -121,12 +121,12 @@ List<ImportWstColumnValue> cValues = column.getColumnValues(); // Set end of range to last station // or expand range to minimal length in case it would be 0 - // TODO: should otherwise be extended to - // (first station of next range - INTERVAL_GAP), + // TODO: should otherwise be extended to + // (first station of next range - INTERVAL_GAP), // assuming always ascending stations BigDecimal lastStation = cValues.get(cValues.size() -1).getPosition(); if (lastStation.compareTo(currentRange.getA()) == 0) { - currentRange.setB(new BigDecimal(lastStation.doubleValue() + currentRange.setB(new BigDecimal(lastStation.doubleValue() + INTERVAL_GAP)); } else {
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/WstParser.java Fri May 16 14:57:46 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/WstParser.java Fri May 16 17:10:10 2014 +0200 @@ -152,7 +152,7 @@ boolean columnHeaderChecked = false; - /* Default string for altitude reference + /* Default string for altitude reference * if none is found in WST-file. * Use in case no unit comment is found in file */ String einheit = "m ΓΌ. unbekannte Referenz"; @@ -343,10 +343,10 @@ } // check consistence of station ordering in file - if (kmHist2 != null && + if (kmHist2 != null && kmHist2.compareTo(kmHist1) != kmHist1.compareTo(kaem)) { - throw new ParseException("WST: Stations in " + file + - " near line " + in.getLineNumber() + + throw new ParseException("WST: Stations in " + file + + " near line " + in.getLineNumber() + " not ordered. File rejected."); } @@ -381,7 +381,7 @@ i, i+colNaWidths[j]).trim(); } } - else { // fetch column names from non-comment header line + else { // fetch column names from non-comment header line // (above first Qs) // first column begins at position 8 in line for (int i = 8, col = 0; i < input.length(); i += 9) { @@ -389,7 +389,7 @@ // but the last one may be shorter if (col < lsBezeichner.length) { lsBezeichner[col++] = - input.substring(i, + input.substring(i, Math.min(i + 9, input.length())).trim(); } if (col == lsBezeichner.length) { @@ -406,7 +406,7 @@ } wst.setUnit(new ImportUnit(einheit)); - // add Q-ranges obtained from previous lines + // add Q-ranges obtained from previous lines // in case there was no further Q-line // but only if there were values following the last Q-line if (minKm != MAX_RANGE && maxKm != MIN_RANGE) { @@ -535,7 +535,7 @@ if (pos >= line.length()) { break; } - strings.add(line.substring(pos, + strings.add(line.substring(pos, Math.min(pos + 8, line.length()))); }