Mercurial > dive4elements > river
diff backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentYieldParser.java @ 7917:9ec6def1a7dd
Make grain fraction type 'unknown' explicit and use it where appropriate.
author | Tom Gottfried <tom@intevation.de> |
---|---|
date | Thu, 05 Jun 2014 15:32:52 +0200 |
parents | c894b7b45c4c |
children | 07cc4cd9233e |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentYieldParser.java Wed Jun 04 18:22:14 2014 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentYieldParser.java Thu Jun 05 15:32:52 2014 +0200 @@ -190,7 +190,7 @@ String newLine = line.replace(FRAKTION_START, "").trim(); if (newLine.length() == 0) { log.debug("Found total grain fraction."); - this.grainFraction = new ImportGrainFraction(GrainFraction.TOTAL); + this.grainFraction = new ImportGrainFraction(GrainFraction.UNKNOWN); return true; } @@ -372,8 +372,7 @@ } log.warn("SYP: Unknown grain fraction: '" + gfStr + "'"); - - return null; + return new ImportGrainFraction(GrainFraction.UNKNOWN); } @@ -402,7 +401,7 @@ } else { log.warn("SYP: Unknown grain fraction '" + filename + "'"); - return "unknown"; + return GrainFraction.UNKNOWN; } }