--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java	Thu Feb 09 15:48:13 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java	Thu Feb 09 15:59:49 2012 +0000
@@ -36,6 +36,7 @@
 import org.jfree.ui.RectangleInsets;
 import org.jfree.ui.TextAnchor;
 
+import de.intevation.artifactdatabase.state.ArtifactAndFacet;
 import de.intevation.artifactdatabase.state.Facet;
 
 import de.intevation.flys.jfree.FLYSAnnotation;
@@ -882,16 +883,17 @@
      */
     protected void doAnnotations(
         FLYSAnnotation annotations,
-        Facet facet,
+        ArtifactAndFacet aandf,
         Document theme,
         boolean visible
     ){
         logger.debug("doAnnotations");
+        Facet facet = aandf.getFacet();
 
         // Add all annotations to our annotation pool.
         annotations.setTheme(theme);
         if (facet != null)
-            annotations.setLabel(facet.getDescription());
+            annotations.setLabel(aandf.getFacetDescription());
         addAnnotations(annotations, visible);
     }
 
@@ -901,11 +903,12 @@
      */
     protected void doPoints(
         Object     o,
-        String     seriesName,
+        ArtifactAndFacet aandf,
         Document   theme,
         boolean    visible,
         int        axisIndex
     ) {
+        String seriesName = aandf.getFacetDescription();
         XYSeries series = new StyledXYSeries(seriesName, theme);
 
         // Add text annotations for single points.