# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1320843968 0
# Node ID 5d5dd44d613ee86eac0e1182fbe4761db9ae6a9e
# Parent  3918bd7eb4e121d4b37ded878fb0c58c7319e4d5
Refactored, move doMainValueAnnotations to XYChartGenerator.

flys-artifacts/trunk@3193 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 3918bd7eb4e1 -r 5d5dd44d613e flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Wed Nov 09 12:55:13 2011 +0000
+++ b/flys-artifacts/ChangeLog	Wed Nov 09 13:06:08 2011 +0000
@@ -1,3 +1,13 @@
+2011-11-09  Felix Wolfsteller <felix.wolfsteller@intevation.de>
+
+	Move do*Annotation* (like mainvalue) in XYChartGenerator.
+
+	* src/main/java/de/intevation/flys/exports/XYChartGenerator.java
+	  (doAnnotations): New, moved from DischargeCurveGenerator.
+
+	* src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java
+	  (doMainValueAnnotations): Moved to superclass.
+
 2011-11-09  Felix Wolfsteller <felix.wolfsteller@intevation.de>
 
 	* src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java:
diff -r 3918bd7eb4e1 -r 5d5dd44d613e flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java	Wed Nov 09 12:55:13 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java	Wed Nov 09 13:06:08 2011 +0000
@@ -130,8 +130,8 @@
                 || name.equals(COMPUTED_DISCHARGE_MAINVALUES_W)
                 || name.equals(MAINVALUES_W))
         {
-            doMainValueAnnotations(
-                nativeFacet.getData(artifact, context), facet, theme, visible);
+            doAnnotations((FLYSAnnotation) nativeFacet.getData(artifact, context),
+                facet, theme, visible);
         }
         else {
            logger.warn("DischargeCurveGenerator.doOut: Unknown facet name: " + name);
@@ -174,24 +174,5 @@
 
         addFirstAxisSeries(series, visible);
     }
-
-            
-
-    /**
-     * Store W MainValues as annotations for later plotting.
-     */
-    protected void doMainValueAnnotations(
-        Object   o,
-        Facet    facet,
-        Document theme,
-        boolean  visible
-    ) {
-        logger.debug("ComputedDischargeCurveGenerator set W MainValues.");
-
-        FLYSAnnotation fa = (FLYSAnnotation) o;
-        fa.setTheme(theme);
-        fa.setLabel(facet.getDescription());
-        addAnnotations(fa, visible);
-    }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
diff -r 3918bd7eb4e1 -r 5d5dd44d613e flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java	Wed Nov 09 12:55:13 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java	Wed Nov 09 13:06:08 2011 +0000
@@ -34,6 +34,8 @@
 
 import org.jfree.ui.RectangleInsets;
 
+import de.intevation.artifactdatabase.state.Facet;
+
 import de.intevation.flys.exports.ChartExportHelper;
 import de.intevation.flys.jfree.FLYSAnnotation;
 import de.intevation.flys.jfree.StickyAxisAnnotation;
@@ -642,5 +644,22 @@
 
         return new XYLineAndShapeRenderer();
     }
+
+
+    /**
+     * Store themed annotations like MainValues for later plotting.
+     */
+    protected void doAnnotations(
+        FLYSAnnotation annotations,
+        Facet facet,
+        Document theme,
+        boolean visible
+    ){
+        logger.debug("doAnnotations");
+
+        annotations.setTheme(theme);
+        annotations.setLabel(facet.getDescription());
+        addAnnotations(annotations, visible);
+    }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :