Mercurial > dive4elements > river
changeset 771:6dc847194625
Removed trailing whitespace.
flys-backend/trunk@2241 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Sun, 26 Jun 2011 17:13:53 +0000 |
| parents | 33a79496ba9e |
| children | c523266c3399 |
| files | flys-backend/ChangeLog flys-backend/src/main/java/de/intevation/flys/importer/AnnotationClassifier.java flys-backend/src/main/java/de/intevation/flys/importer/AnnotationsParser.java flys-backend/src/main/java/de/intevation/flys/importer/AtFileParser.java flys-backend/src/main/java/de/intevation/flys/importer/ValueKey.java flys-backend/src/main/java/de/intevation/flys/importer/WstParser.java |
| diffstat | 6 files changed, 22 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-backend/ChangeLog Sun Jun 26 17:04:44 2011 +0000 +++ b/flys-backend/ChangeLog Sun Jun 26 17:13:53 2011 +0000 @@ -1,3 +1,12 @@ +2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * src/main/java/de/intevation/flys/importer/AnnotationsParser.java, + src/main/java/de/intevation/flys/importer/AnnotationClassifier.java, + src/main/java/de/intevation/flys/importer/AtFileParser.java, + src/main/java/de/intevation/flys/importer/ValueKey.java, + src/main/java/de/intevation/flys/importer/WstParser.java: + Removed trailing whitespace. + 2011-06-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> * src/main/java/de/intevation/flys/importer/AnnotationClassifier.java:
--- a/flys-backend/src/main/java/de/intevation/flys/importer/AnnotationClassifier.java Sun Jun 26 17:04:44 2011 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/importer/AnnotationClassifier.java Sun Jun 26 17:13:53 2011 +0000 @@ -122,7 +122,7 @@ if (pair != null) { filePatterns.add(pair); } - } + } } protected void buildDescriptionPatterns(Document rules) { @@ -144,7 +144,7 @@ if (pair != null) { descPatterns.add(pair); } - } + } } protected Pair buildPair(Element element) {
--- a/flys-backend/src/main/java/de/intevation/flys/importer/AnnotationsParser.java Sun Jun 26 17:04:44 2011 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/importer/AnnotationsParser.java Sun Jun 26 17:13:53 2011 +0000 @@ -147,7 +147,7 @@ attribute, position, range, edge, type); if (!annotations.add(annotation)) { - log.warn("duplicated annotation '" + parts[0] + + log.warn("duplicated annotation '" + parts[0] + "' in line " + in.getLineNumber()); } }
--- a/flys-backend/src/main/java/de/intevation/flys/importer/AtFileParser.java Sun Jun 26 17:04:44 2011 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/importer/AtFileParser.java Sun Jun 26 17:13:53 2011 +0000 @@ -27,7 +27,7 @@ // regular expression from hell to find out time range public static final Pattern DATE_LINE = Pattern.compile( - "^\\*\\s*Abflu[^t]+tafel?\\s*([^\\d]+)" + + "^\\*\\s*Abflu[^t]+tafel?\\s*([^\\d]+)" + "(\\d{1,2})?\\.?(\\d{1,2})?\\.?(\\d{2,4})\\s*(?:(?:bis)|-)?\\s*" + "(?:(\\d{1,2})?\\.?(\\d{1,2})?\\.?(\\d{2,4}))?\\s*.*$");
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ValueKey.java Sun Jun 26 17:04:44 2011 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/importer/ValueKey.java Sun Jun 26 17:13:53 2011 +0000 @@ -9,7 +9,7 @@ public static final double EPSILON = 1e-6; public static final Comparator<ValueKey> EPSILON_COMPARATOR = - new Comparator<ValueKey>() + new Comparator<ValueKey>() { public int compare(ValueKey x, ValueKey y) { int cmp = ValueKey.compare(x.a, y.a); @@ -52,10 +52,10 @@ } ValueKey o = (ValueKey)other; return !( - (a == null && o.a != null) - || (a != null && o.a == null) - || (a != null && !a.equals(o.a)) - || (b == null && o.b != null) + (a == null && o.a != null) + || (a != null && o.a == null) + || (a != null && !a.equals(o.a)) + || (b == null && o.b != null) || (b != null && o.b == null) || (b != null && !b.equals(o.b))); }
--- a/flys-backend/src/main/java/de/intevation/flys/importer/WstParser.java Sun Jun 26 17:04:44 2011 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/importer/WstParser.java Sun Jun 26 17:13:53 2011 +0000 @@ -247,8 +247,8 @@ if (!kms.add(kaem)) { log.warn( - "km " + kaem + - " (line " + in.getLineNumber() + + "km " + kaem + + " (line " + in.getLineNumber() + ") found more than once. -> ignored"); continue; } @@ -338,8 +338,8 @@ return; } - if (to.compareTo(from) < 0) { - BigDecimal t = from; from = to; to = t; + if (to.compareTo(from) < 0) { + BigDecimal t = from; from = to; to = t; } ImportRange range = new ImportRange(from, to);