changeset 5247:93d4145d5740

Waterlevel*Parser, ImportRiver: Remove deprecated exportWst()-usage.
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Tue, 12 Mar 2013 12:28:26 +0100 (2013-03-12)
parents d9deec811152
children 35b78d8c44b8
files flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java flys-backend/src/main/java/de/intevation/flys/importer/parsers/WaterlevelDifferencesParser.java flys-backend/src/main/java/de/intevation/flys/importer/parsers/WaterlevelParser.java
diffstat 3 files changed, 2 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java	Tue Mar 12 12:15:47 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java	Tue Mar 12 12:28:26 2013 +0100
@@ -561,7 +561,7 @@
         // TODO use own List<ImportWst> for waterlevels
         // The parsed ImportWaterlevels are converted to
         // 'fixation'-wsts now.
-        for(ImportWst iw: parser.exportWsts()) {
+        for(ImportWst iw: parser.getWaterlevels()) {
             iw.setDescription("CSV/" + iw.getDescription());
             fixations.add(iw);
         }
@@ -624,7 +624,7 @@
         }
 
         // WaterlevelDifferences become Wsts now.
-        for(ImportWst iw: parser.exportWsts()) {
+        for(ImportWst iw: parser.getDifferences()) {
             iw.setDescription("CSV/" + iw.getDescription());
             waterlevelDifferences.add(iw);
         }
--- a/flys-backend/src/main/java/de/intevation/flys/importer/parsers/WaterlevelDifferencesParser.java	Tue Mar 12 12:15:47 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/WaterlevelDifferencesParser.java	Tue Mar 12 12:28:26 2013 +0100
@@ -52,12 +52,6 @@
     }
 
 
-    // TODO deprecate
-    public List<ImportWst> exportWsts() {
-        return differences;
-    }
-
-
     /**
      * Parse a csv waterleveldifferenceparser and create a ImportWst object
      * from it.
--- a/flys-backend/src/main/java/de/intevation/flys/importer/parsers/WaterlevelParser.java	Tue Mar 12 12:15:47 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/WaterlevelParser.java	Tue Mar 12 12:28:26 2013 +0100
@@ -62,16 +62,6 @@
     }
 
 
-    /**
-     * Create ImportWst objects from ImportWaterlevel
-     * objects.
-     * TODO deprecate
-     */
-    public List<ImportWst> exportWsts() {
-        return waterlevels;
-    }
-
-
     public List<ImportWst> getWaterlevels() {
         return waterlevels;
     }

http://dive4elements.wald.intevation.org