Mercurial > dive4elements > river
changeset 7375:450582bcad75
Replaced tabs with 4 spaces.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Thu, 17 Oct 2013 15:13:32 +0200 |
| parents | 82191d111130 |
| children | 4b26fd60105f |
| files | backend/src/main/java/org/dive4elements/river/importer/parsers/WstParser.java |
| diffstat | 1 files changed, 22 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/WstParser.java Thu Oct 17 15:05:08 2013 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/WstParser.java Thu Oct 17 15:13:32 2013 +0200 @@ -120,12 +120,12 @@ log.info("Parsing WST file '" + file + "'"); - if (wst == null) { - wst = new ImportWst(file.getName()); - } - else { - wst.setDescription(file.getName()); - } + if (wst == null) { + wst = new ImportWst(file.getName()); + } + else { + wst.setDescription(file.getName()); + } LineNumberReader in = new LineNumberReader( @@ -348,7 +348,7 @@ throw new ParseException("Stations in " + file + " near line " + in.getLineNumber() + " not ordered. File rejected."); - } + } // remember stations in two previous lines kmHist2 = kmHist1; @@ -409,12 +409,12 @@ // 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) { - if (kmHist1 != null && kmHist2 != null - && kmHist1.compareTo(kmHist2) < 0) { // stations descending in file - BigDecimal t = minKm; minKm = maxKm; maxKm = t; - } - addInterval(minKm, maxKm, aktAbfluesse); - } + if (kmHist1 != null && kmHist2 != null + && kmHist1.compareTo(kmHist2) < 0) { // stations descending in file + BigDecimal t = minKm; minKm = maxKm; maxKm = t; + } + addInterval(minKm, maxKm, aktAbfluesse); + } } finally { in.close(); @@ -452,15 +452,15 @@ return; } - // expand single-line i.e. 0-lenght Q-range to minimal length - if (from == to) { - if (lastRange != null && lastA > lastB) { - to = new BigDecimal(from.doubleValue() - INTERVAL_GAP); - } - else { - to = new BigDecimal(from.doubleValue() + INTERVAL_GAP); - } - } + // expand single-line i.e. 0-lenght Q-range to minimal length + if (from == to) { + if (lastRange != null && lastA > lastB) { + to = new BigDecimal(from.doubleValue() - INTERVAL_GAP); + } + else { + to = new BigDecimal(from.doubleValue() + INTERVAL_GAP); + } + } ImportRange range = new ImportRange(from, to);