--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java	Mon Oct 17 08:45:26 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java	Mon Oct 17 10:47:36 2011 +0000
@@ -1,8 +1,5 @@
 package de.intevation.flys.exports;
 
-import java.util.Date;
-import java.util.List;
-
 import org.apache.log4j.Logger;
 
 import org.w3c.dom.Document;
@@ -17,10 +14,8 @@
 
 import de.intevation.artifactdatabase.state.Facet;
 
-import de.intevation.flys.model.DischargeTable;
 import de.intevation.flys.model.Gauge;
 import de.intevation.flys.model.River;
-import de.intevation.flys.model.TimeInterval;
 
 import de.intevation.flys.artifacts.WINFOArtifact;
 
@@ -111,14 +106,14 @@
 
         WINFOArtifact flysArtifact = (WINFOArtifact) artifact;
 
-        facet = flysArtifact.getNativeFacet(facet);
+        Facet nativeFacet = flysArtifact.getNativeFacet(facet);
 
-        if (facet == null) {
+        if (nativeFacet == null) {
             logger.debug("no facet found");
             return;
         }
 
-        WQKms wqkms = (WQKms)facet.getData(flysArtifact, context);
+        WQKms wqkms = (WQKms)nativeFacet.getData(flysArtifact, context);
 
         String gaugeName = wqkms.getName();
 
@@ -136,14 +131,12 @@
             return;
         }
 
-        String seriesName = getSeriesName(gauge);
-
         double [][] values = new double [][] {
             wqkms.getQs(), wqkms.getWs() };
 
         int size = values != null ? values[0].length : 0;
 
-        XYSeries series = new StyledXYSeries(seriesName, attr);
+        XYSeries series = new StyledXYSeries(facet.getDescription(), attr);
 
         for (int i = 0; i < size; i++) {
             series.add(values[0][i], values[1][i]);
@@ -151,42 +144,5 @@
 
         addFirstAxisSeries(series, visible);
     }
-
-
-    protected String getSeriesName(Gauge gauge) {
-         //XXX The following code stops the artifact server accepting new HTTP
-         //requests. It needs more analysis! Is loading the discharge table a
-         //memory problem? Or is the time interval the problem?
-
-        List<DischargeTable> dts = gauge.getDischargeTables();
-
-        for (DischargeTable dt: dts) {
-            if (dt.getKind() == 0) {
-                TimeInterval ti = dt.getTimeInterval();
-
-                Date start = ti.getStartTime();
-                Date end   = ti.getStopTime();
-
-                String name  = gauge.getName();
-
-                if (end == null) {
-                    Object[] args = new Object[] { name, start };
-                    return msg(
-                        "chart.discharge.curve.curve.valid.from",
-                        "",
-                        args);
-                }
-                else {
-                    Object[] args = new Object[] { name, start, end };
-                    return msg(
-                        "chart.discharge.curve.curve.valid.range",
-                        "",
-                        args);
-                }
-            }
-        }
-
-        return gauge.getName();
-    }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :