--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java	Mon Nov 28 15:00:46 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java	Wed Nov 30 10:10:42 2011 +0000
@@ -26,6 +26,7 @@
 import de.intevation.flys.model.River;
 
 import de.intevation.flys.artifacts.WINFOArtifact;
+import de.intevation.artifactdatabase.state.ArtifactAndFacet;
 
 import de.intevation.flys.artifacts.resources.Resources;
 import de.intevation.flys.utils.FLYSUtils;
@@ -183,6 +184,9 @@
     }
 
 
+    /**
+     * Get Range of Domain ("X"-) Axis from request.
+     */
     protected Range getDomainAxisRange() {
         Element xrange = (Element)XMLUtils.xpath(
             request,
@@ -199,8 +203,6 @@
         String lower = xrange.getAttributeNS(uri, "from");
         String upper = xrange.getAttributeNS(uri, "to");
 
-        logger.debug("FOUND X RANGE: " + lower + " -> " + upper);
-
         if (lower.length() > 0 && upper.length() > 0) {
             try {
                 double from = Double.parseDouble(lower);
@@ -239,8 +241,10 @@
             return null;
         }
 
+
         String uri = ArtifactNamespaceContext.NAMESPACE_URI;
 
+
         String lower = yrange.getAttributeNS(uri, "from");
         String upper = yrange.getAttributeNS(uri, "to");
 
@@ -254,13 +258,9 @@
                     return null;
                 }
 
-                if (from > to) {
-                    double tmp = to;
-                    to         = from;
-                    from       = tmp;
-                }
-
-                return new Range(from, to);
+                return from > to
+                       ? new Range(to, from)
+                       : new Range(from, to);
             }
             catch (NumberFormatException nfe) {
                 logger.warn("Wrong values for value axis range.");
@@ -282,8 +282,7 @@
 
 
     public abstract void doOut(
-        Artifact artifact,
-        Facet    facet,
+        ArtifactAndFacet bundle,
         Document attr,
         boolean  visible);