--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/AbstractExporter.java	Mon Nov 28 15:00:46 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/AbstractExporter.java	Wed Nov 30 10:10:42 2011 +0000
@@ -13,6 +13,7 @@
 import de.intevation.artifacts.Artifact;
 import de.intevation.artifacts.CallContext;
 
+import de.intevation.artifactdatabase.state.ArtifactAndFacet;
 import de.intevation.artifactdatabase.state.Facet;
 
 import de.intevation.artifacts.common.ArtifactNamespaceContext;
@@ -112,12 +113,11 @@
      */
     @Override
     public void doOut(
-        Artifact artifact,
-        Facet    facet,
-        Document attr,
-        boolean  visible
+        ArtifactAndFacet artifactFacet,
+        Document         attr,
+        boolean          visible
     ) {
-        String name = facet.getName();
+        String name = artifactFacet.getFacetName();
 
         logger.debug("AbstractExporter.doOut: " + name);
 
@@ -126,13 +126,7 @@
             return;
         }
 
-        FLYSArtifact flys = (FLYSArtifact)artifact;
-
-        Facet nativeFacet = flys.getNativeFacet(facet);
-
-        if (nativeFacet != null) {
-            addData(nativeFacet.getData(flys, context));
-        }
+        addData(artifactFacet.getData(context));
     }