--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java	Mon Nov 28 15:00:46 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java	Wed Nov 30 10:10:42 2011 +0000
@@ -20,9 +20,10 @@
 import de.intevation.flys.artifacts.model.FacetTypes;
 import de.intevation.flys.artifacts.model.WKms;
 
-import de.intevation.flys.utils.DataUtil;
+import de.intevation.artifactdatabase.state.ArtifactAndFacet;
 
 import de.intevation.flys.artifacts.model.WQKms;
+import de.intevation.flys.utils.DataUtil;
 import de.intevation.flys.utils.FLYSUtils;
 
 import de.intevation.flys.jfree.FLYSAnnotation;
@@ -133,12 +134,11 @@
      */
     @Override
     public void doOut(
-        Artifact artifact,
-        Facet    facet,
-        Document attr,
-        boolean  visible
+        ArtifactAndFacet artifactAndFacet,
+        Document         attr,
+        boolean          visible
     ) {
-        String name = facet.getName();
+        String name = artifactAndFacet.getFacetName();
 
         logger.debug("WDifferencesCurveGenerator.doOut: " + name);
 
@@ -147,29 +147,24 @@
             return;
         }
 
-        FLYSArtifact flys = (FLYSArtifact) artifact;
-        Facet        f    = flys.getNativeFacet(facet);
-
-        if (f == null) {
-            return;
-        }
-
         if (name.equals(W_DIFFERENCES)) {
             doWDifferencesOut(
-                (WKms) f.getData(artifact, context),
-                facet,
+                (WKms) artifactAndFacet.getData(context),
+                artifactAndFacet.getFacetDescription(),
                 attr,
                 visible);
         }
         else if (name.equals(LONGITUDINAL_W)) {
-            doWOut((WQKms) f.getData(artifact, context), facet, attr, visible);
+            doWOut((WQKms) artifactAndFacet.getData(context),
+                artifactAndFacet.getFacetDescription(), attr, visible);
         }
         else if (name.equals(STATIC_WKMS) || name.equals(HEIGHTMARKS_POINTS)) {
-            doWOut((WKms) f.getData(artifact, context), facet, attr, visible);
+            doWOut((WKms) artifactAndFacet.getData(context),
+                artifactAndFacet.getFacetDescription(), attr, visible);
         }
         else if (name.equals(LONGITUDINAL_ANNOTATION)) {
-            doAnnotations((FLYSAnnotation) f.getData(artifact, context),
-                 facet, attr, visible);
+            doAnnotations((FLYSAnnotation) artifactAndFacet.getData(context),
+                 artifactAndFacet.getFacet(), attr, visible);
         }
         else {
             logger.warn("Unknown facet name: " + name);
@@ -187,13 +182,13 @@
      */
     protected void doWOut(
         WKms     wkms,
-        Facet    facet,
+        String   description,
         Document theme,
         boolean  visible
     ) {
         logger.debug("WDifferencesCurveGenerator.doWOut");
 
-        XYSeries series = new StyledXYSeries(facet.getDescription(), theme);
+        XYSeries series = new StyledXYSeries(description, theme);
 
         StyledSeriesBuilder.addPoints(series, wkms);
 
@@ -232,10 +227,10 @@
      * Add items to dataseries which describes the differences.
      */
     protected void doWDifferencesOut(
-        WKms       wkms,
-        Facet      facet,
-        Document   theme,
-        boolean    visible
+        WKms     wkms,
+        String   description,
+        Document theme,
+        boolean  visible
     ) {
         logger.debug("WDifferencesCurveGenerator.doWDifferencesOut");
         if (wkms == null) {
@@ -243,7 +238,7 @@
             return;
          }
 
-        XYSeries series = new StyledXYSeries(facet.getDescription(), theme);
+        XYSeries series = new StyledXYSeries(description, theme);
 
         if (logger.isDebugEnabled()) {
             if (wkms.size() > 0) {