--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java	Mon Nov 28 15:00:46 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java	Wed Nov 30 10:10:42 2011 +0000
@@ -15,6 +15,7 @@
 
 import de.intevation.artifacts.Artifact;
 
+import de.intevation.artifactdatabase.state.ArtifactAndFacet;
 import de.intevation.artifactdatabase.state.Facet;
 
 import de.intevation.flys.artifacts.FLYSArtifact;
@@ -87,12 +88,11 @@
 
     @Override
     public void doOut(
-        Artifact artifact,
-        Facet    facet,
-        Document attr,
-        boolean  visible
+        ArtifactAndFacet artifactFacet,
+        Document         attr,
+        boolean          visible
     ) {
-        String name = (facet != null) ? facet.getName() : null;
+        String name = artifactFacet.getFacetName();
 
         logger.debug("ComputedDischargeCurveGenerator.doOut: " + name);
 
@@ -101,17 +101,16 @@
             return;
         }
 
-        FLYSArtifact flys = (FLYSArtifact) artifact;
-        Facet        f    = flys.getNativeFacet(facet);
+        Facet facet = artifactFacet.getFacet();
 
         if (name.equals(COMPUTED_DISCHARGE_Q)) {
-            doQOut((WQKms) f.getData(artifact, context), facet, attr, visible);
+            doQOut((WQKms) artifactFacet.getData(context), facet, attr, visible);
         }
         else if (name.equals(STATIC_WQ)) {
-            doWQOut(f.getData(artifact, context), facet, attr, visible);
+            doWQOut(artifactFacet.getData(context), facet, attr, visible);
         }
         else if (name.equals(STATIC_WQ_ANNOTATIONS)) {
-            doWQAnnotations(f.getData(artifact, context), facet, attr, visible);
+            doWQAnnotations(artifactFacet.getData(context), facet, attr, visible);
         }
         else if (name.equals(COMPUTED_DISCHARGE_MAINVALUES_Q)
                 || name.equals(MAINVALUES_Q)
@@ -119,10 +118,10 @@
                 || name.equals(MAINVALUES_W)
         ) {
             doAnnotations((FLYSAnnotation)
-                f.getData(artifact, context), facet, attr, visible);
+                artifactFacet.getData(context), facet, attr, visible);
         }
         else if (name.equals(STATIC_WKMS_INTERPOL)) {
-            doWAnnotations(f.getData(artifact, context), facet, attr, visible);
+            doWAnnotations(artifactFacet.getData(context), facet, attr, visible);
         }
         else {
             logger.warn("Unknown facet type for computed discharge: " + name);
@@ -134,7 +133,7 @@
      * Add WQ Data to plot.
      */
     protected void doWQOut(
-        Object    wqkms,
+        Object   wqkms,
         Facet    facet,
         Document theme,
         boolean  visible
@@ -147,6 +146,7 @@
         addAxisSeries(series, YAXIS.W.idx, visible);
     }
 
+
     /**
      * Add Q-Series to plot.
      * @param wqkms actual data
@@ -189,6 +189,7 @@
             facet, theme, visible);
     }
 
+
     /**
      * Add W-Annotations to plot.
      * @param wqkms actual data