[Dive4elements-commits] [PATCH 2 of 2] ImportRiver: Cosmetics, resolved todo

[Wald Commits]

# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1363162895 -3600
# Node ID 0d9ad1c432b8b1c1e54472d84a8f004aacd69652
# Parent  1e403a0efc2107786659cb633509b9435a61810c
ImportRiver: Cosmetics, resolved todo.

diff -r 1e403a0efc21 -r 0d9ad1c432b8 flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java	Wed Mar 13 09:19:33 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java	Wed Mar 13 09:21:35 2013 +0100
@@ -552,7 +552,7 @@
         File[] files = wspDir.listFiles();
 
         if (files == null) {
-            log.warn("Cannot read directory '" + wspDir + "'");
+            log.warn("Cannot read directory for wl '" + wspDir + "'");
             return;
         }
 
@@ -562,7 +562,6 @@
             parser.parse(file);
         }
 
-        // TODO use own List<ImportWst> for waterlevels
         // The parsed ImportWaterlevels are converted to
         // 'fixation'-wsts now.
         for(ImportWst iw: parser.getWaterlevels()) {
@@ -1131,8 +1130,8 @@
     }
 
     public void storeFixations() {
-        if (!Config.INSTANCE.skipFixations() || !Config.INSTANCE.skipWaterlevels()) {
-            log.info("store fixation wsts and/or csvs");
+        if (!Config.INSTANCE.skipFixations()) {
+            log.info("store fixation wsts");
             River river = getPeer();
             for (ImportWst fWst: fixations) {
                 log.debug("Fixation name: " + fWst.getDescription());
@@ -1145,7 +1144,7 @@
     /** Store wsts from waterlevel-csv files. */
     public void storeWaterlevels() {
         if (!Config.INSTANCE.skipWaterlevels())
-        
+
         log.info("store waterlevel wsts from csv");
         River river = getPeer();
         for (ImportWst wWst: waterlevels) {
@@ -1153,7 +1152,7 @@
             wWst.storeDependencies(river);
         }
     }
-        
+
 
     /** Store wsts from waterleveldifference-csv files. */
     public void storeWaterlevelDifferences() {
@@ -1201,6 +1200,7 @@
         }
     }
 
+
     public void storeFloodProtection() {
         if (!Config.INSTANCE.skipFloodProtection()) {
             log.info("store flood protection wsts");