# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1350379647 -7200
# Node ID d39f229ea990a149b25193f453f48c8acfbcf24d
# Parent  0ac1158605bd2a99581391ff8cf88e6bd0a587d3# Parent  d7db9baa4e6237a2e471a61b3eb9fd92e605bac6
Merged.

diff -r 0ac1158605bd -r d39f229ea990 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Tue Oct 16 09:44:06 2012 +0200
+++ b/flys-artifacts/ChangeLog	Tue Oct 16 11:27:27 2012 +0200
@@ -5,6 +5,13 @@
 	  src/main/resources/messages_de_DE.properties:
 	  Fix typo
 
+2012-10-16  Ingo Weinzierl <ingo@intevation.de>
+
+	flys/issue930
+
+	* src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java:
+	  Add unit [cm] to the facet description if calculation mode is W.
+
 2012-10-15  Ingo Weinzierl <ingo@intevation.de>
 
 	flys/issue904
@@ -12787,7 +12794,6 @@
 	  not. In addition, the scenario parameter used by WSPLGEN is now set
 	  correctly.
 
->>>>>>> .r3356
 2011-12-05	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	Allow longitudinal_section.q facets in wdiff states output.
diff -r 0ac1158605bd -r d39f229ea990 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java	Tue Oct 16 09:44:06 2012 +0200
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java	Tue Oct 16 11:27:27 2012 +0200
@@ -37,6 +37,8 @@
     private static final Logger logger =
         Logger.getLogger(HistoricalDischargeComputeState.class);
 
+    public static final String DEFAULT_UNIT = "cm";
+
 
     @Override
     protected void appendItems(
@@ -103,7 +105,7 @@
             facets.add(new HistoricalDischargeFacet(
                 i,
                 HISTORICAL_DISCHARGE_Q,
-                wqt.getName()));
+                createFacetTitle(wqt)));
 
             if (wqt instanceof HistoricalWQTimerange) {
                 logger.debug("Create another facet for historical differences.");
@@ -117,5 +119,25 @@
             i++;
         }
     }
+
+
+    protected String createFacetTitle(WQTimerange wqt) {
+        String name = wqt.getName();
+
+        return name != null && name.indexOf("W") >= 0
+            ? createFacetTitleW(wqt)
+            : createFacetTitleQ(wqt);
+    }
+
+
+    protected String createFacetTitleW(WQTimerange wqt) {
+        String name = wqt.getName();
+        return name + " " + DEFAULT_UNIT;
+    }
+
+
+    protected String createFacetTitleQ(WQTimerange wqt) {
+        return wqt.getName();
+    }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :