Mercurial > dive4elements > river
diff backend/src/main/java/org/dive4elements/river/importer/parsers/MeasurementStationsParser.java @ 8665:8fbc0649da13
Move static measurement types to their natural home.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Wed, 08 Apr 2015 14:47:30 +0200 |
| parents | 9db1f48bfea9 |
| children | 2693bfaf503d 0a5239a1e46e |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/MeasurementStationsParser.java Tue Apr 07 16:35:11 2015 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/MeasurementStationsParser.java Wed Apr 08 14:47:30 2015 +0200 @@ -16,6 +16,8 @@ import org.apache.log4j.Logger; +import org.dive4elements.river.model.MeasurementStation; + import org.dive4elements.river.importer.ImportMeasurementStation; import org.dive4elements.river.importer.ImportRange; import org.dive4elements.river.importer.ImportTimeInterval; @@ -36,9 +38,6 @@ public static final int MAX_COMMENT_LENGTH = 512; - public static final String MEASUREMENT_TYPE_BEDLOAD = "Geschiebe"; - public static final String MEASUREMENT_TYPE_SUSP = "Schwebstoff"; - private static final Logger log = Logger .getLogger(MeasurementStationsParser.class); @@ -144,8 +143,8 @@ protected String getMeasurementType(String[] cols, int lineNum) throws MeasurementStationParserException { String mtype = cols[2].trim(); - if (!(MEASUREMENT_TYPE_BEDLOAD.equals(mtype) || - MEASUREMENT_TYPE_SUSP.equals(mtype))) { + if (!(MeasurementStation.MEASUREMENT_TYPE_BEDLOAD.equals(mtype) || + MeasurementStation.MEASUREMENT_TYPE_SUSP.equals(mtype))) { throw new MeasurementStationParserException( "invalid measurement type in line " + lineNum); }