--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java	Mon Nov 28 15:00:46 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java	Wed Nov 30 10:10:42 2011 +0000
@@ -14,6 +14,7 @@
 
 import de.intevation.artifacts.Artifact;
 
+import de.intevation.artifactdatabase.state.ArtifactAndFacet;
 import de.intevation.artifactdatabase.state.Facet;
 
 import de.intevation.flys.artifacts.FLYSArtifact;
@@ -116,29 +117,15 @@
     }
 
 
-    protected void adjustAxes(XYPlot plot) {
-        super.adjustAxes(plot);
-
-        NumberAxis qAxis = new NumberAxis(
-            msg(I18N_YAXIS_LABEL, I18N_YAXIS_LABEL_DEFAULT));
-
-        plot.setRangeAxis(1, qAxis);
-
-        Font font = plot.getRangeAxis(0).getLabelFont();
-        qAxis.setLabelFont(font);
-    }
-
-
     /**
      * Let one facet do its job.
      */
     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("CrossSectionGenerator.doOut: " + name);
 
@@ -147,24 +134,17 @@
             return;
         }
 
-        FLYSArtifact flys = (FLYSArtifact) artifact;
-        Facet        f    = flys.getNativeFacet(facet);
-
-        if (f == null) {
-            return;
-        }
-
         if (name.equals(CROSS_SECTION)) {
             doCrossSectionOut(
-                f.getData(artifact, context),
-                f.getDescription(),
+                artifactFacet.getData(context),
+                artifactFacet.getFacetDescription(),
                 attr,
                 visible);
         }
         else if (name.equals(CROSS_SECTION_WATER_LINE)) {
             doCrossSectionWaterLineOut(
-                f.getData(artifact, context),
-                f.getDescription(),
+                artifactFacet.getData(context),
+                artifactFacet.getFacetDescription(),
                 attr,
                 visible);
         }