--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java	Fri Oct 21 14:02:07 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java	Fri Oct 21 15:19:49 2011 +0000
@@ -36,9 +36,9 @@
 
 import de.intevation.flys.exports.ChartExportHelper;
 import de.intevation.flys.jfree.FLYSAnnotation;
-import de.intevation.flys.utils.ThemeUtil;
 import de.intevation.flys.jfree.StickyAxisAnnotation;
 
+import de.intevation.flys.utils.ThemeAccess;
 
 /**
  * An abstract base class for creating XY charts.
@@ -446,24 +446,17 @@
         for (FLYSAnnotation fa: annotations) {
             Document theme = fa.getTheme();
 
-            Color color = theme != null
-                ? ThemeUtil.parseLineColorField(theme)
-                : null;
+            ThemeAccess themeAccess = new ThemeAccess(theme);
 
-            if (color == null) {
-                color = Color.black;
-            }
-
-            int lineWidth = theme != null
-                ? ThemeUtil.parseLineWidth(theme)
-                : 1;
+            Color color   = themeAccess.parseLineColorField();
+            int lineWidth = themeAccess.parseLineWidth();
 
             lic.add(new LegendItem(fa.getLabel(), color));
 
             for (XYTextAnnotation ta: fa.getAnnotations()) {
                 if(ta instanceof StickyAxisAnnotation) {
                     StickyAxisAnnotation sta = (StickyAxisAnnotation)ta;
-                    sta.applyTheme(theme);
+                    sta.applyTheme(themeAccess);
                     renderer.addAnnotation(sta);
                 }
                 else {