--- a/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixWQCurveGenerator.java	Wed Nov 06 12:07:48 2013 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixWQCurveGenerator.java	Wed Nov 06 19:12:46 2013 +0100
@@ -155,12 +155,13 @@
 
     /** Returns value != 0 if the current km is not at a gauge. */
     public double getCurrentGaugeDatum() {
-        if (context.getContextValue(CURRENT_KM) != null) {
+        Object ckm = context.getContextValue(CURRENT_KM);
+        if (ckm != null) {
             return DischargeCurveGenerator.getCurrentGaugeDatum(
-                (Double) context.getContextValue(CURRENT_KM),
+                (Double) ckm,
                 (D4EArtifact) getMaster(), 1e-4);
         }
-        else return 0d;
+        return 0d;
     }
 
     /** Overriden to show second axis also if no visible data present. */
@@ -196,7 +197,8 @@
         else if(FIX_ANALYSIS_EVENTS_WQ.equals(name)) {
             doAnalysisEventsOut(aaf, doc, visible);
         }
-        else if(FIX_REFERENCE_EVENTS_WQ.equals(name)) {
+        else if(FIX_REFERENCE_EVENTS_WQ.equals(name)
+             || FIX_EVENTS.equals(name)) {
             doReferenceEventsOut(aaf, doc, visible);
         }
         else if(FIX_WQ_CURVE.equals(name)) {
@@ -208,9 +210,11 @@
         else if(QSECTOR.equals(name)) {
             doQSectorOut(aaf, doc, visible);
         }
+        /*
         else if(FIX_EVENTS.equals(name)) {
             doEventsOut(aaf, doc, visible);
         }
+        */
         else if(/*STATIC_WKMS_INTERPOL.equals(name) ||*/
                 STATIC_WKMS_MARKS.equals(name) ||
                 STATIC_WKMS.equals(name) ||
@@ -227,7 +231,7 @@
             doWQOut(aaf.getData(context), aaf, doc, visible);
         }
         else if (name.equals(DISCHARGE_CURVE)) {
-        logger.debug("diso " + name);
+            logger.debug("diso " + name);
             doDischargeOut(
                     (WINFOArtifact) aaf.getArtifact(),
                     aaf.getData(context),
@@ -431,8 +435,9 @@
                         maxQ); // end
                 addAxisSeries(series2, YAXIS.W.idx, false);
                 // Use second axis at cm if at gauge.
-                for (int i = 0; i < series.getItemCount(); i++) {
-                    series.updateByIndex(i, new Double(100d*(series.getY(i).doubleValue()-gaugeDatum)));
+                for (int i = 0, N = series.getItemCount(); i < N; i++) {
+                    series.updateByIndex(
+                        i, new Double(100d*(series.getY(i).doubleValue()-gaugeDatum)));
                 }
                 addAxisSeries(series, YAXIS.WCm.idx, visible);
             }
@@ -758,10 +763,9 @@
     protected String getDefaultYAxisLabel(int pos) {
         D4EArtifact flys = (D4EArtifact) master;
 
-        String unit = RiverUtils.getRiver(flys).getWstUnit().getName();
-        if (pos == 0) {
-            unit = "cm";
-        }
+        String unit = pos == 0
+            ? "cm"
+            : RiverUtils.getRiver(flys).getWstUnit().getName();
 
         return msg(I18N_YAXIS_LABEL, I18N_YAXIS_LABEL_DEFAULT, new Object[] { unit });
     }