diff backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentLoadLSParser.java @ 8031:6954ac9b7591

Renamed ImportSedimentYield to ImportSedimentLoadLS.
author Sascha L. Teichmann <teichmann@intevation.de>
date Fri, 11 Jul 2014 13:10:05 +0200
parents c915e99d9e52
children fd3a24336e6a
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentLoadLSParser.java	Fri Jul 11 11:32:18 2014 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentLoadLSParser.java	Fri Jul 11 13:10:05 2014 +0200
@@ -22,7 +22,7 @@
 import org.apache.log4j.Logger;
 
 import org.dive4elements.river.importer.ImportGrainFraction;
-import org.dive4elements.river.importer.ImportSedimentYield;
+import org.dive4elements.river.importer.ImportSedimentLoadLS;
 import org.dive4elements.river.importer.ImportSedimentLoadLSValue;
 import org.dive4elements.river.importer.ImportTimeInterval;
 import org.dive4elements.river.importer.ImportUnit;
@@ -92,9 +92,9 @@
         Pattern.compile("(<|>){1}\\s*((([0-9]+?,[0-9]+?)|([0-9]++))\\s*(\\w+))");
 
 
-    protected List<ImportSedimentYield> sedimentYields;
+    protected List<ImportSedimentLoadLS> sedimentYields;
 
-    protected ImportSedimentYield[] current;
+    protected ImportSedimentLoadLS[] current;
 
     protected ImportGrainFraction grainFraction;
 
@@ -106,7 +106,7 @@
 
 
     public SedimentLoadLSParser() {
-        sedimentYields = new ArrayList<ImportSedimentYield>();
+        sedimentYields = new ArrayList<ImportSedimentLoadLS>();
     }
 
 
@@ -129,7 +129,7 @@
     @Override
     protected void finish() {
         if (current != null) {
-            for (ImportSedimentYield isy: current) {
+            for (ImportSedimentLoadLS isy: current) {
                 sedimentYields.add(isy);
             }
         }
@@ -247,7 +247,7 @@
      * with respect to file location (offical epoch or not?) */
     private void initializeSedimentYields() {
         // skip first column (Fluss-km) and last column (Hinweise)
-        current = new ImportSedimentYield[columnNames.length-2];
+        current = new ImportSedimentLoadLS[columnNames.length-2];
 
         Integer kind;
 
@@ -259,7 +259,7 @@
         }
 
         for (int i = 0, n = columnNames.length; i < n-2; i++) {
-            current[i] = new ImportSedimentYield(this.description);
+            current[i] = new ImportSedimentLoadLS(this.description);
             current[i].setTimeInterval(getTimeInterval(columnNames[i+1]));
             current[i].setUnit(unit);
             current[i].setGrainFraction(grainFraction);
@@ -407,7 +407,7 @@
     }
 
 
-    public List<ImportSedimentYield> getSedimentYields() {
+    public List<ImportSedimentLoadLS> getSedimentYields() {
         return sedimentYields;
     }
 }

http://dive4elements.wald.intevation.org