diff flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java @ 3409:97ad960f5579

Add subtitle to Fix W/Q chart and refactor addSubtitle() method(s) flys-artifacts/trunk@5062 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Christian Lins <christian.lins@intevation.de>
date Thu, 19 Jul 2012 12:59:56 +0000
parents 50d61a2494cb
children b9aff8d6ff74
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java	Thu Jul 19 12:55:45 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java	Thu Jul 19 12:59:56 2012 +0000
@@ -28,9 +28,7 @@
 import javax.xml.xpath.XPathConstants;
 
 import org.apache.log4j.Logger;
-import org.jfree.chart.JFreeChart;
 import org.jfree.chart.annotations.XYTextAnnotation;
-import org.jfree.chart.title.TextTitle;
 import org.jfree.data.time.Day;
 import org.jfree.data.time.Month;
 import org.jfree.data.time.RegularTimePeriod;
@@ -118,27 +116,17 @@
     @Override
     protected String getDefaultChartSubtitle() {
         FixAnalysisAccess access = new FixAnalysisAccess(artifact);
-        DateRange range = access.getDateRange();
+        DateRange dateRange = access.getDateRange();
+        DateRange refRange  = access.getReferencePeriod();
         return Resources.format(
                 context.getMeta(),
                 I18N_CHART_SUBTITLE,
                 "",
                 access.getRiver(),
-                range.getFrom(),
-                range.getTo());
-    }
-
-
-    /**
-     * Empty (suppress subtitle).
-     */
-    @Override
-    protected void addSubtitles(JFreeChart chart) {
-        String subtitle = getChartSubtitle();
-
-        if (subtitle != null && subtitle.length() > 0) {
-            chart.addSubtitle(new TextTitle(subtitle));
-        }
+                dateRange.getFrom(),
+                dateRange.getTo(),
+                refRange.getFrom(),
+                refRange.getTo());
     }
 
 

http://dive4elements.wald.intevation.org