Mercurial > dive4elements > river
diff backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentYieldParser.java @ 7340:2ce7bacc940f double-precision
Merged changes from default into double precision branch.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Tue, 15 Oct 2013 18:41:55 +0200 |
| parents | c894b7b45c4c |
| children | 9ec6def1a7dd |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentYieldParser.java Tue Oct 15 15:32:36 2013 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentYieldParser.java Tue Oct 15 18:41:55 2013 +0200 @@ -379,7 +379,7 @@ public static String getGrainFractionTypeName(String filename) { if (Pattern.matches(FRACTION_COARSE_STR, filename)) { - return GrainFraction.COARSE; + return GrainFraction.COARSE; } else if (Pattern.matches(FRACTION_FINE_MIDDLE_STR, filename)) { return GrainFraction.FINE_MIDDLE; @@ -391,7 +391,7 @@ else if (Pattern.matches(FRACTION_SUSP_SAND, filename)) { return GrainFraction.SUSP_SAND; } - else if (Pattern.matches(FRACTION_SAND, filename)) { + else if (Pattern.matches(FRACTION_SAND, filename)) { return GrainFraction.SAND; } else if (Pattern.matches(FRACTION_SUSPENDED_SEDIMENT, filename)) {