Mercurial > dive4elements > river
diff backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentLoadParser.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 | 0a5239a1e46e |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentLoadParser.java Tue Apr 07 16:35:11 2015 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentLoadParser.java Wed Apr 08 14:47:30 2015 +0200 @@ -22,9 +22,6 @@ import org.dive4elements.river.model.River; import org.dive4elements.river.model.MeasurementStation; -import static org.dive4elements.river.importer.parsers.MeasurementStationsParser.MEASUREMENT_TYPE_BEDLOAD; -import static org.dive4elements.river.importer.parsers.MeasurementStationsParser.MEASUREMENT_TYPE_SUSP; - /** Parses sediment load longitudinal section files. */ public class SedimentLoadParser extends AbstractSedimentLoadParser { private static final Logger log = @@ -130,13 +127,15 @@ return; } if (gfn.equals(GRAINFRACTION_NAME_SUSP) && - m.getMeasurementType().equals(MEASUREMENT_TYPE_SUSP)) { + m.getMeasurementType().equals( + MeasurementStation.MEASUREMENT_TYPE_SUSP)) { // susp. sediment can only be at respective stations initializeSedimentLoadValues(vals, m); return; } if (!gfn.equals(GRAINFRACTION_NAME_SUSP) && - m.getMeasurementType().equals(MEASUREMENT_TYPE_BEDLOAD)) { + m.getMeasurementType().equals( + MeasurementStation.MEASUREMENT_TYPE_BEDLOAD)) { /** anything but total load and susp. sediment can only be at bed load measurement stations */ initializeSedimentLoadValues(vals, m);