[PATCH 1 of 2] Add compatibility with more facet names for mainvalues

Wald Commits scm-commit at wald.intevation.org
Tue Jul 30 19:14:55 CEST 2013


# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1375203575 -7200
# Node ID b494a9cf25e5ebf4a2f01ce8a3a7a1b33078b9f0
# Parent  b265cd6cfda5fa03a9396ac1a951b3a26c3b8218
Add compatibility with more facet names for mainvalues.

    This allows to configure the theme or just use the default theme.

diff -r b265cd6cfda5 -r b494a9cf25e5 artifacts/src/main/java/org/dive4elements/river/exports/HistoricalDischargeWQCurveGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/HistoricalDischargeWQCurveGenerator.java	Tue Jul 30 17:32:28 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/HistoricalDischargeWQCurveGenerator.java	Tue Jul 30 18:59:35 2013 +0200
@@ -134,11 +134,10 @@
             doPoints(artifactFacet.getData(context), artifactFacet, theme,
                 visible, YAXIS.W.idx);
         }
-        else if (HISTORICAL_DISCHARGE_MAINVALUES_Q.equals(name)) {
-            doAnnotations((RiverAnnotation)
-                artifactFacet.getData(context), artifactFacet, theme, visible);
-        }
-        else if (HISTORICAL_DISCHARGE_MAINVALUES_W.equals(name)) {
+        else if (name.equals(MAINVALUES_W) ||
+                 name.equals(MAINVALUES_Q) ||
+                 HISTORICAL_DISCHARGE_MAINVALUES_Q.equals(name) ||
+                 HISTORICAL_DISCHARGE_MAINVALUES_W.equals(name)) {
             doAnnotations((RiverAnnotation)
                 artifactFacet.getData(context), artifactFacet, theme, visible);
         }


More information about the Dive4elements-commits mailing list