--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java	Tue Jun 21 18:10:49 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java	Tue Jun 21 21:41:49 2011 +0000
@@ -44,6 +44,7 @@
     }
 
 
+    @Override
     public void addDatasets(JFreeChart chart) {
         super.addDatasets(chart);
 
@@ -53,6 +54,7 @@
     }
 
 
+    @Override
     protected void adjustPlot(XYPlot plot) {
         super.adjustPlot(plot);
 
@@ -81,7 +83,7 @@
     protected void adjustAxes(XYPlot plot) {
         super.adjustAxes(plot);
 
-        plot.mapDatasetToRangeAxis(2, 1);
+        plot.mapDatasetToRangeAxis(2, 0);
     }
 
 
@@ -90,23 +92,30 @@
     public void doOut(Artifact artifact, Facet facet, Document attr) {
         logger.debug("DischargeLongitudinalSectionGenerator.doOut");
 
-        String name = facet != null ? facet.getName() : null;
+        if (facet == null) {
+            return;
+        }
+
+        String name = facet.getName();
+
+        if (name == null) {
+            return;
+        }
 
         FLYSArtifact flys = (FLYSArtifact) artifact;
         Facet        f    = flys.getNativeFacet(facet);
 
-        if (name != null && name.equals(DISCHARGE_LONGITUDINAL_W)) {
+        if (name.equals(DISCHARGE_LONGITUDINAL_W)) {
             doWOut((WQKms) f.getData(artifact, context));
         }
-        else if (name != null && name.equals(DISCHARGE_LONGITUDINAL_Q)) {
+        else if (name.equals(DISCHARGE_LONGITUDINAL_Q)) {
             doQOut((WQKms) f.getData(artifact, context));
         }
-        else if (name != null && name.equals(DISCHARGE_LONGITUDINAL_C)) {
+        else if (name.equals(DISCHARGE_LONGITUDINAL_C)) {
             doCorrectedWOut((WQCKms) f.getData(artifact, context));
         }
         else {
             logger.warn("Unknown facet name: " + name);
-            return;
         }
     }
 
@@ -119,18 +128,13 @@
     protected void doCorrectedWOut(WQCKms wqckms) {
         logger.debug("DischargeLongitudinalSectionGenerator.doCorrectedWOut");
 
-        XYSeries series = new XYSeries(getSeriesNameForCorrected(wqckms, "W"));
-
-        double[] target = new double[4];
-        int      size   = wqckms.size();
+        int size = wqckms.size();
 
-        for (int i = 0; i < size; i++) {
-            target = wqckms.get(i, target);
-
-            series.add(target[2], target[3]);
-        }
-
-        if (series.getItemCount() > 0) {
+        if (size > 0) {
+            XYSeries series = new XYSeries(getSeriesNameForCorrected(wqckms, "W"));
+            for (int i = 0; i < size; i++) {
+                series.add(wqckms.getKms(i), wqckms.getC(i));
+            }
             cw.addSeries(series);
         }
     }
@@ -140,13 +144,13 @@
         String name = wqkms.getName();
 
         name = name.replace(
-            "Benutzerdefiniert",
-            "Benutzerdefiniert [korrigiert]");
+            "benutzerdefiniert",
+            "benutzerdefiniert [korrigiert]");
 
-        String prefix = name != null && name.indexOf(mode) >= 0 ? null : mode;
+        String prefix = name.indexOf(mode) >= 0 ? null : mode;
 
         return prefix != null && prefix.length() > 0
-            ? prefix + "(" + name +")"
+            ? prefix + "(" + name + ")"
             : name;
     }
 }