--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java	Fri Jul 06 13:02:35 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java	Fri Jul 06 14:45:23 2012 +0000
@@ -11,12 +11,12 @@
 import de.intevation.flys.exports.TimeseriesChartGenerator;
 import de.intevation.flys.jfree.CollisionFreeXYTextAnnotation;
 import de.intevation.flys.jfree.FLYSAnnotation;
+import de.intevation.flys.jfree.StyledDomainMarker;
 import de.intevation.flys.jfree.StyledTimeSeries;
+import de.intevation.flys.jfree.StyledValueMarker;
 import de.intevation.flys.utils.FLYSUtils;
 import de.intevation.flys.utils.ThemeUtil;
 
-import java.awt.BasicStroke;
-import java.awt.Color;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -29,8 +29,6 @@
 import org.apache.log4j.Logger;
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.annotations.XYTextAnnotation;
-import org.jfree.chart.plot.IntervalMarker;
-import org.jfree.chart.plot.ValueMarker;
 import org.jfree.chart.title.TextTitle;
 import org.jfree.data.time.Day;
 import org.jfree.data.time.Month;
@@ -317,8 +315,6 @@
                 qwd.getQ() + " m\u00B3/s",
                 x,
                 qwd.getDeltaW());
-            //anno.setRotationAngle(200f*Math.PI/180f);
-            //anno.setRotationAnchor(TextAnchor.CENTER_LEFT);
             textAnnos.add(anno);
             logger.debug("annotation: " + x + "/" + qwd.getDeltaW());
         }
@@ -403,12 +399,8 @@
             return;
         }
         double[] value = (double[]) data;
-        IntervalMarker lower = new IntervalMarker((value[0] * -1), 0);
-        lower.setAlpha(0.2f);
-        lower.setPaint(Color.BLACK);
-        IntervalMarker upper = new IntervalMarker(0, value[0]);
-        upper.setAlpha(0.2f);
-        upper.setPaint(Color.BLACK);
+        StyledDomainMarker lower = new StyledDomainMarker((value[0] * -1), 0, theme);
+        StyledDomainMarker upper = new StyledDomainMarker(0, value[0], theme);
 
         valueMarker.add(lower);
         valueMarker.add(upper);
@@ -432,16 +424,10 @@
             logger.debug("creating domain marker");
             RegularTimePeriod start = new Month(ranges[i].getFrom());
             RegularTimePeriod end = new Month(ranges[i].getTo());
-            IntervalMarker marker =
-                new IntervalMarker(start.getMiddleMillisecond(),
-                                   end.getMiddleMillisecond());
-            marker.setAlpha(0.3f);
-            if ((i % 2) == 0) {
-                marker.setPaint(Color.RED);
-            }
-            else {
-                marker.setPaint(Color.BLUE);
-            }
+            StyledDomainMarker marker =
+                new StyledDomainMarker(start.getMiddleMillisecond(),
+                                   end.getMiddleMillisecond(), theme);
+            marker.useSecondColor(i % 2 == 0);
             domainMarker.add(marker);
         }
         logger.debug("domainmarkers: " + domainMarker.size());
@@ -455,9 +441,7 @@
         logger.debug("currentKm = " + new Double(getCurrentKmFromRequest()));
         context.putContextValue("currentKm", new Double(getCurrentKmFromRequest()));
 
-        ValueMarker marker = new ValueMarker(0);
-        marker.setPaint(Color.black);
-        marker.setStroke(new BasicStroke(2));
+        StyledValueMarker marker = new StyledValueMarker(0, request);
         valueMarker.add(marker);
     }