# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1318417301 0
# Node ID 2c643a643026e9597e358c4a5b046ba339ec5479
# Parent  e8627d1e2db64a86ba8293ffa29cd96e1f465d9d
Addressed 'wrong label' issue of wdiff csv-export.

flys-artifacts/trunk@2949 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r e8627d1e2db6 -r 2c643a643026 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Wed Oct 12 10:59:12 2011 +0000
+++ b/flys-artifacts/ChangeLog	Wed Oct 12 11:01:41 2011 +0000
@@ -1,3 +1,12 @@
+2011-10-12	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	Addressed "Wrong labels" [6] part of flys/issue371 (W-INFO / Differenzen:
+	Anmerkungen zur Umsetzung) .
+
+	* src/main/java/de/intevation/flys/exports/WDifferencesExporter.java:
+	  Adjusted variable names to avoid conflict in subclasses, adjusted
+	  default value for i18n string.
+
 2011-10-12	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	Cosmetics, docs.
diff -r e8627d1e2db6 -r 2c643a643026 flys-artifacts/src/main/java/de/intevation/flys/exports/WDifferencesExporter.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/WDifferencesExporter.java	Wed Oct 12 10:59:12 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/WDifferencesExporter.java	Wed Oct 12 11:01:41 2011 +0000
@@ -28,14 +28,14 @@
     private static Logger logger = Logger.getLogger(WDifferencesExporter.class);
 
 
-    public static final String CSV_KM_HEADER =
+    public static final String WDIFF_CSV_KM_HEADER =
         "export.w_differences.csv.header.km";
 
-    public static final String CSV_W_HEADER =
+    public static final String WDIFF_CSV_W_HEADER =
         "export.w_differences.csv.header.w";
 
-    public static final String DEFAULT_CSV_KM_HEADER = "Fluss-Km";
-    public static final String DEFAULT_CSV_W_HEADER  = "W [NN + m]";
+    public static final String WDIFF_DEFAULT_CSV_KM_HEADER = "Fluss-Km";
+    public static final String WDIFF_DEFAULT_CSV_W_HEADER  = "m";
 
 
     /** The storage that contains all WKms objects for the different facets. */
@@ -116,8 +116,8 @@
         logger.info("WDifferencesExporter.writeCSVHeader");
 
         writer.writeNext(new String[] {
-            msg(CSV_KM_HEADER, DEFAULT_CSV_KM_HEADER),
-            msg(CSV_W_HEADER, DEFAULT_CSV_W_HEADER)
+            msg(WDIFF_CSV_KM_HEADER, WDIFF_DEFAULT_CSV_KM_HEADER),
+            msg(WDIFF_CSV_W_HEADER, WDIFF_DEFAULT_CSV_W_HEADER)
         });
     }