--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java	Mon Nov 28 15:00:46 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java	Wed Nov 30 10:10:42 2011 +0000
@@ -8,6 +8,7 @@
 
 import de.intevation.artifacts.Artifact;
 
+import de.intevation.artifactdatabase.state.ArtifactAndFacet;
 import de.intevation.artifactdatabase.state.Facet;
 
 import de.intevation.flys.artifacts.FLYSArtifact;
@@ -37,44 +38,38 @@
 
     @Override
     public void doOut(
-        Artifact artifact,
-        Facet    facet,
-        Document attr,
-        boolean  visible
+        ArtifactAndFacet artifactFacet,
+        Document         attr,
+        boolean          visible
     ) {
         logger.debug("DischargeLongitudinalSectionGenerator.doOut");
 
-        if (facet == null) {
-            return;
-        }
-
-        String name = facet.getName();
+        String name = artifactFacet.getFacetName();
 
         if (name == null) {
             return;
         }
 
-        FLYSArtifact flys = (FLYSArtifact) artifact;
-        Facet        f    = flys.getNativeFacet(facet);
+        Facet facet = artifactFacet.getFacet();
 
         if (IS.WQ_KM(name)) {
-            doWOut((WQKms) f.getData(artifact, context), facet, attr, visible);
+            doWOut((WQKms) artifactFacet.getData(context), facet, attr, visible);
         }
         else if (name.equals(DISCHARGE_LONGITUDINAL_Q)) {
-            doQOut((WQKms) f.getData(artifact, context), facet, attr, visible);
+            doQOut((WQKms) artifactFacet.getData(context), facet, attr, visible);
         }
         else if (name.equals(DISCHARGE_LONGITUDINAL_C)) {
             doCorrectedWOut(
-                (WQCKms) f.getData(artifact, context),
+                (WQCKms) artifactFacet.getData(context),
                 facet,
                 attr,
                 visible);
         }
         else if (IS.W_KM(name)) {
-            doWOut((WKms) f.getData(artifact, context), facet, attr, visible);
+            doWOut((WKms) artifactFacet.getData(context), facet, attr, visible);
         }
         else if (name.equals(LONGITUDINAL_ANNOTATION)) {
-            doAnnotations((FLYSAnnotation) f.getData(artifact, context),
+            doAnnotations((FLYSAnnotation) artifactFacet.getData(context),
                  facet, attr, visible);
         }
         else {