--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java	Thu Jul 26 09:56:50 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java	Thu Jul 26 10:02:07 2012 +0000
@@ -22,6 +22,8 @@
 import de.intevation.flys.jfree.StyledAreaSeriesCollection;
 import de.intevation.flys.jfree.StyledSeries;
 import de.intevation.flys.model.River;
+import de.intevation.flys.themes.LineStyle;
+import de.intevation.flys.themes.TextStyle;
 import de.intevation.flys.themes.ThemeAccess;
 import de.intevation.flys.utils.FLYSUtils;
 import de.intevation.flys.utils.ThemeUtil;
@@ -179,8 +181,8 @@
         StickyAxisAnnotation annotation,
         XYPlot plot,
         ChartArea area,
-        ThemeAccess.LineStyle lineStyle,
-        ThemeAccess.TextStyle textStyle,
+        LineStyle lineStyle,
+        TextStyle textStyle,
         Document theme
     ) {
         // OPTIMIZE pre-calculate area-related values
@@ -301,7 +303,7 @@
      * @param lineStyle the line style to use for the line.
      */
     protected static XYLineAnnotation createGroundStickAnnotation(
-        ChartArea area, float pos, ThemeAccess.LineStyle lineStyle
+        ChartArea area, float pos, LineStyle lineStyle
     ) {
         // Style the line.
         if (lineStyle != null) {
@@ -325,7 +327,7 @@
      * @param lineStyle the line style to use for the line.
      */
     protected static XYLineAnnotation createRightStickAnnotation(
-        ChartArea area, float pos, ThemeAccess.LineStyle lineStyle
+        ChartArea area, float pos, LineStyle lineStyle
     ) {
         // Style the line.
         if (lineStyle != null) {
@@ -349,7 +351,7 @@
      * @param lineStyle the line style to use for the line.
      */
     protected static XYLineAnnotation createLeftStickAnnotation(
-        ChartArea area, float pos, ThemeAccess.LineStyle lineStyle
+        ChartArea area, float pos, LineStyle lineStyle
     ) {
         // Style the line.
         if (lineStyle != null) {
@@ -376,7 +378,7 @@
      */
     protected static XYLineAnnotation createStickyLineAnnotation(
         StickyAxisAnnotation.SimpleAxis axis, float fromD1, float toD2,
-        ChartArea area, ThemeAccess.LineStyle lineStyle
+        ChartArea area, LineStyle lineStyle
     ) {
         double anchorX1 = 0d, anchorX2 = 0d, anchorY1 = 0d, anchorY2 = 0d;
         switch(axis) {
@@ -436,8 +438,8 @@
 
             // Access text styling, if any.
             Document theme = fa.getTheme();
-            ThemeAccess.TextStyle textStyle = null;
-            ThemeAccess.LineStyle lineStyle = null;
+            TextStyle textStyle = null;
+            LineStyle lineStyle = null;
 
             // Get Themeing information and add legend item.
             if (theme != null) {