# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1351081641 -7200
# Node ID 640adb7bced54f5d714403181db32ec97d63c344
# Parent  6942a8b31d9597e830c6e7e4fb77d95bb32c52db# Parent  d952372e7083aea6b53ea5eeaf4081b9101a9db0
Merged.

diff -r d952372e7083 -r 640adb7bced5 flys-artifacts/src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java	Wed Oct 24 08:04:20 2012 +0200
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java	Wed Oct 24 14:27:21 2012 +0200
@@ -64,7 +64,7 @@
             List<Facet> list = new ArrayList<Facet>();
             List<Facet> wlist = filterFacets.get("longitudinal_section");
             for (Facet f: wlist) {
-                if (!f.getName().equals("longitudinal_section.q")) {
+                if (!f.getName().equals(LONGITUDINAL_Q)) {
                     DefaultFacet df = new DefaultFacet(f.getIndex(),
                         "longitudinal_section.q", "");
                     list.add(df);
diff -r d952372e7083 -r 640adb7bced5 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java	Wed Oct 24 08:04:20 2012 +0200
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java	Wed Oct 24 14:27:21 2012 +0200
@@ -74,7 +74,7 @@
 
 
     /**
-     * Returns the data this facet requires.
+     * Returns the data this facet provides.
      *
      * @param artifact the owner artifact.
      * @param context  the CallContext (ignored).
@@ -85,7 +85,7 @@
     public Object getData(Artifact artifact, CallContext context) {
         MainValuesArtifact mvArtifact = (MainValuesArtifact) artifact;
 
-        List<NamedDouble>      ws = mvArtifact.getMainValuesW(isAtGauge);
+        List<NamedDouble> ws = mvArtifact.getMainValuesW(isAtGauge);
         List<StickyAxisAnnotation> xy = new ArrayList<StickyAxisAnnotation>();
 
         // Find whether a duration curve is on the blackboard.
diff -r d952372e7083 -r 640adb7bced5 flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java	Wed Oct 24 08:04:20 2012 +0200
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java	Wed Oct 24 14:27:21 2012 +0200
@@ -617,7 +617,7 @@
             annotations.setLabel(aandf.getFacetDescription());
         }
         else {
-            logger.debug(
+            logger.error(
                 "Art/Facet for Annotations is null. " +
                 "This should never happen!");
         }