--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java	Fri Jul 01 08:33:52 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DurationCurveGenerator.java	Fri Jul 01 11:16:11 2011 +0000
@@ -14,7 +14,6 @@
 import org.jfree.chart.title.TextTitle;
 import org.jfree.data.Range;
 import org.jfree.data.xy.XYSeries;
-import org.jfree.data.xy.XYSeriesCollection;
 
 import de.intevation.artifacts.Artifact;
 
@@ -38,12 +37,6 @@
     private static Logger logger =
         Logger.getLogger(DurationCurveGenerator.class);
 
-    /** The storage for the W series to be drawn in this chart.*/
-    protected XYSeriesCollection w;
-
-    /** The storage for the Q series to be drawn in this chart.*/
-    protected XYSeriesCollection q;
-
 
     public static final String I18N_DURATION_W =
         "chart.duration.curve.curve.w";
@@ -75,9 +68,6 @@
 
     public DurationCurveGenerator() {
         super();
-
-        this.w = new XYSeriesCollection();
-        this.q = new XYSeriesCollection();
     }
 
 
@@ -122,42 +112,34 @@
     }
 
 
-    public void addDatasets(JFreeChart chart) {
-        XYPlot plot = (XYPlot) chart.getPlot();
-
-        plot.setDataset(0, w);
-        plot.setDataset(1, q);
-    }
-
-
     protected void adjustPlot(XYPlot plot) {
         super.adjustPlot(plot);
 
         // TODO REMOVE THIS CODE, IF WE HAVE INTRODUCED THEMES!
-        XYLineAndShapeRenderer rw = (XYLineAndShapeRenderer)
-            plot.getRendererForDataset(w);
-
-        XYLineAndShapeRenderer rq = null;
-        try {
-            rq = (XYLineAndShapeRenderer) rw.clone();
-        }
-        catch (Exception e) {
-            logger.error(e, e);
-        }
+        //XYLineAndShapeRenderer rw = (XYLineAndShapeRenderer)
+        //    plot.getRendererForDataset(w);
 
-        int wNum = w.getSeriesCount();
-        int qNum = q.getSeriesCount();
+        //XYLineAndShapeRenderer rq = null;
+        //try {
+        //    rq = (XYLineAndShapeRenderer) rw.clone();
+        //}
+        //catch (Exception e) {
+        //    logger.error(e, e);
+        //}
 
-        for (int i = 0; i < wNum; i++) {
-            rw.setSeriesPaint(i, Color.BLUE);
-        }
+        //int wNum = w.getSeriesCount();
+        //int qNum = q.getSeriesCount();
 
-        for (int i = 0; i < qNum; i++) {
-            rq.setSeriesPaint(i, Color.GREEN);
-        }
+        //for (int i = 0; i < wNum; i++) {
+        //    rw.setSeriesPaint(i, Color.BLUE);
+        //}
 
-        plot.setRenderer(0, rw);
-        plot.setRenderer(1, rq);
+        //for (int i = 0; i < qNum; i++) {
+        //    rq.setSeriesPaint(i, Color.GREEN);
+        //}
+
+        //plot.setRenderer(0, rw);
+        //plot.setRenderer(1, rq);
     }
 
 
@@ -167,7 +149,6 @@
         NumberAxis qAxis = new NumberAxis("Q [m\u00b3/s]");
 
         plot.setRangeAxis(1, qAxis);
-        plot.mapDatasetToRangeAxis(1, 1);
     }
 
 
@@ -219,7 +200,7 @@
             series.add((double) day, w);
         }
 
-        this.w.addSeries(series);
+        addFirstAxisSeries(series);
     }
 
 
@@ -244,7 +225,7 @@
             series.add((double) day, q);
         }
 
-        this.q.addSeries(series);
+        addSecondAxisSeries(series);
     }