--- a/artifacts/src/main/java/org/dive4elements/river/exports/DischargeCurveGenerator.java	Tue Jun 05 19:10:38 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/DischargeCurveGenerator.java	Tue Jun 05 19:21:16 2018 +0200
@@ -28,6 +28,7 @@
 import org.dive4elements.river.themes.ThemeDocument;
 
 import org.dive4elements.artifactdatabase.state.State;
+import org.dive4elements.artifacts.CallContext;
 import org.dive4elements.river.artifacts.GaugeDischargeCurveArtifact;
 
 import org.apache.log4j.Logger;
@@ -121,8 +122,8 @@
         if (getMaster() instanceof GaugeDischargeCurveArtifact) {
             GaugeDischargeCurveArtifact myMaster =
                 (GaugeDischargeCurveArtifact) getMaster();
-            State state = myMaster.getCurrentState(context);
-            if (myMaster.STATIC_STATE_NAME.equals(state.getID())) {
+            State state = myMaster.getCurrentState(getContext());
+            if (GaugeDischargeCurveArtifact.STATIC_STATE_NAME.equals(state.getID())) {
                 return;
             }
         }
@@ -213,13 +214,13 @@
      * Returns always null to suppress subtitles.
      */
     @Override
-    protected String getDefaultChartTitle() {
+    protected String getDefaultChartTitle(final CallContext context) {
         return null;
     }
 
 
     @Override
-    protected String getDefaultXAxisLabel() {
+    protected String getDefaultXAxisLabel(final CallContext context) {
         return msg(I18N_XAXIS_LABEL, I18N_XAXIS_LABEL_DEFAULT);
     }
 
@@ -278,6 +279,8 @@
         String name = artifactFacet.getFacetName();
         log.debug("DischargeCurveGenerator.doOut: " + name);
 
+        final CallContext context = getContext();
+        
         MiscDischargeProcessor dProcessor = new MiscDischargeProcessor(
             getRange()[0]);
         if (dProcessor.canHandle(name)) {
@@ -376,8 +379,7 @@
         double y,
         ThemeDocument theme
     ) {
-        List<XYTextAnnotation> textAnnos =
-            new ArrayList<XYTextAnnotation>();
+        final List<XYTextAnnotation> textAnnos = new ArrayList<>();
         XYTextAnnotation anno = new CollisionFreeXYTextAnnotation(
                 title,
                 x,
@@ -429,8 +431,7 @@
 
         // If no Q values (i.e. all -1) found, add annotations.
         if (hasNoDischarge(data)) {
-            List<StickyAxisAnnotation> xy =
-                new ArrayList<StickyAxisAnnotation>();
+            final List<StickyAxisAnnotation> xy = new ArrayList<>();
 
             for (double y: data[1]) {
                 if (translate != 0d) {