diff artifacts/src/main/java/org/dive4elements/river/exports/DurationCurveGenerator.java @ 9123:1cc7653ca84f

Cleanup of ChartGenerator and ChartGenerator2 code. Put some of the copy/pasted code into a common abstraction.
author gernotbelger
date Tue, 05 Jun 2018 19:21:16 +0200
parents 5e38e2924c07
children 740d65e4aa14
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/DurationCurveGenerator.java	Tue Jun 05 19:10:38 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/DurationCurveGenerator.java	Tue Jun 05 19:21:16 2018 +0200
@@ -9,6 +9,7 @@
 package org.dive4elements.river.exports;
 
 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
+import org.dive4elements.artifacts.CallContext;
 import org.dive4elements.river.artifacts.model.FacetTypes;
 import org.dive4elements.river.artifacts.model.WQDay;
 import org.dive4elements.river.jfree.Bounds;
@@ -95,13 +96,13 @@
 
 
     @Override
-    protected String getDefaultChartTitle() {
+    protected String getDefaultChartTitle(final CallContext context) {
         return msg(I18N_CHART_TITLE, I18N_CHART_TITLE_DEFAULT);
     }
 
 
     @Override
-    protected String getDefaultChartSubtitle() {
+    protected String getDefaultChartSubtitle(final CallContext context) {
         double[] dist  = getRange();
 
         Object[] args = new Object[] {
@@ -114,7 +115,7 @@
 
 
     @Override
-    protected String getDefaultXAxisLabel() {
+    protected String getDefaultXAxisLabel(final CallContext context) {
         return msg(I18N_XAXIS_LABEL, I18N_XAXIS_LABEL_DEFAULT);
     }
 
@@ -123,7 +124,7 @@
     protected String getDefaultYAxisLabel(int index) {
         String label = "default";
         if (index == YAXIS.W.idx) {
-            label = msg(I18N_YAXIS_LABEL_W, new Object[] { getRiverUnit() });
+            label = msg(I18N_YAXIS_LABEL_W, I18N_YAXIS_LABEL_W, new Object[] { getRiverUnit() });
         }
         else if (index == YAXIS.Q.idx) {
             label = msg(I18N_YAXIS_LABEL_Q);
@@ -192,6 +193,8 @@
             log.error("No facet given. Cannot create dataset.");
             return;
         }
+        
+        final CallContext context = getContext();
 
         if (name.equals(DURATION_W)) {
             doWOut(

http://dive4elements.wald.intevation.org