[Dive4elements-commits] [PATCH 1 of 2] Waterlevel*Parser, ImportRiver: Remove deprecated exportWst()-usage

Wald Commits scm-commit at wald.intevation.org
Tue Mar 12 12:21:34 CET 2013


# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1363087706 -3600
# Node ID 93d4145d5740cd146004113965e6bcc54fe53258
# Parent  d9deec8111524fd7d090cdb1a0f798a6f6826ace
Waterlevel*Parser, ImportRiver: Remove deprecated exportWst()-usage.

diff -r d9deec811152 -r 93d4145d5740 flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java
--- 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);
         }
diff -r d9deec811152 -r 93d4145d5740 flys-backend/src/main/java/de/intevation/flys/importer/parsers/WaterlevelDifferencesParser.java
--- 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.
diff -r d9deec811152 -r 93d4145d5740 flys-backend/src/main/java/de/intevation/flys/importer/parsers/WaterlevelParser.java
--- 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;
     }


More information about the Dive4elements-commits mailing list