--- a/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixWQCurveGenerator.java	Fri Sep 05 12:54:58 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixWQCurveGenerator.java	Fri Sep 05 12:58:17 2014 +0200
@@ -70,8 +70,8 @@
 extends      FixChartGenerator
 implements   FacetTypes
 {
-    /** Private logger. */
-    private static Logger logger =
+    /** Private log. */
+    private static Logger log =
             Logger.getLogger(FixWQCurveGenerator.class);
 
     public static final String I18N_CHART_TITLE =
@@ -156,7 +156,7 @@
                     fixedWinMRange.getUpperBound());
         }
 
-        logger.debug("Syncing Axis Bounds. Bounds W: " + boundsInMGauge.toString() +
+        log.debug("Syncing Axis Bounds. Bounds W: " + boundsInMGauge.toString() +
                 " Bounds Wcm: " + boundsInCM.toString());
 
         double datum = getCurrentGaugeDatum();
@@ -176,15 +176,15 @@
         // Set the new combined bounds
         setYBounds(YAXIS.W.idx, boundsInMGauge);
         setYBounds(YAXIS.WCm.idx, boundsInCM);
-        logger.debug("Synced Bounds W: " + boundsInMGauge.toString() +
+        log.debug("Synced Bounds W: " + boundsInMGauge.toString() +
                 " Bounds Wcm: " + boundsInCM.toString());
     }
 
     @Override
     public void doOut(ArtifactAndFacet aaf, ThemeDocument doc, boolean visible) {
-        logger.debug("doOut: " + aaf.getFacetName());
+        log.debug("doOut: " + aaf.getFacetName());
         if (!prepareChartData(aaf, doc, visible)) {
-            logger.warn("Unknown facet, name " + aaf.getFacetName());
+            log.warn("Unknown facet, name " + aaf.getFacetName());
         }
     }
 
@@ -237,7 +237,7 @@
             doWQOut(aaf.getData(context), aaf, doc, visible);
         }
         else if (name.equals(DISCHARGE_CURVE)) {
-            logger.debug("diso " + name);
+            log.debug("diso " + name);
             doDischargeOut(
                     (WINFOArtifact) aaf.getArtifact(),
                     aaf.getData(context),
@@ -267,7 +267,7 @@
 
     /** Add sector average points to chart. */
     protected void doSectorAverageOut(ArtifactAndFacet aaf, ThemeDocument doc, boolean visible) {
-        logger.debug("doSectorAverageOut");
+        log.debug("doSectorAverageOut");
 
         QWDDateRange qwdd = (QWDDateRange) aaf.getData(context);
         QWD qwd = qwdd != null ? qwdd.getQWD() : null;
@@ -276,7 +276,7 @@
             addQWSeries(new QWD[] { qwd }, aaf, doc, visible);
         }
         else {
-            logger.debug("doSectorAverageOut: qwd == null");
+            log.debug("doSectorAverageOut: qwd == null");
         }
     }
 
@@ -286,12 +286,12 @@
         ThemeDocument    doc,
         boolean          visible
     ) {
-        logger.debug("doAnalysisEventsOut");
+        log.debug("doAnalysisEventsOut");
 
         QWD qwd = (QWD)aaf.getData(context);
 
         if (qwd == null) {
-            logger.debug("doAnalysisEventsOut: qwd == null");
+            log.debug("doAnalysisEventsOut: qwd == null");
             return;
         }
 
@@ -340,11 +340,11 @@
 
     /** Add reference event points to chart. */
     protected void doReferenceEventsOut(ArtifactAndFacet aaf, ThemeDocument doc, boolean visible) {
-        logger.debug("doReferenceEventsOut");
+        log.debug("doReferenceEventsOut");
 
         QWI qwd = (QWI)aaf.getData(context);
         if (qwd == null) {
-            logger.debug("doReferenceEventsOut: qwds == null");
+            log.debug("doReferenceEventsOut: qwds == null");
             return;
         }
 
@@ -398,7 +398,7 @@
         XYSeries series = new StyledXYSeries(title, theme);
         Double ckm = (Double) context.getContextValue(CURRENT_KM);
         if (wqkms == null || wqkms.getKms().length == 0 || ckm == null) {
-            logger.info("addPointFromWQKms: No event data to show.");
+            log.info("addPointFromWQKms: No event data to show.");
             return;
         }
         double[] kms = wqkms.getKms();
@@ -425,7 +425,7 @@
     }
 
     protected void doEventsOut(ArtifactAndFacet aaf, ThemeDocument doc, boolean visible) {
-        logger.debug("doEventsOut");
+        log.debug("doEventsOut");
         // Find W/Q at km.
         addPointFromWQKms((WQKms) aaf.getData(context),
             aaf.getFacetDescription(), doc, visible);
@@ -433,14 +433,14 @@
 
 
     protected void doWQCurveOut(ArtifactAndFacet aaf, ThemeDocument doc, boolean visible) {
-        logger.debug("doWQCurveOut");
+        log.debug("doWQCurveOut");
 
         FixWQCurveFacet facet = (FixWQCurveFacet)aaf.getFacet();
         FixFunction func = (FixFunction)facet.getData(
                 aaf.getArtifact(), context);
 
         if (func == null) {
-            logger.warn("doWQCurveOut: Facet does not contain FixFunction");
+            log.warn("doWQCurveOut: Facet does not contain FixFunction");
             return;
         }
 
@@ -478,12 +478,12 @@
             }
         }
         else {
-            logger.warn("doWQCurveOut: maxQ <= 0");
+            log.warn("doWQCurveOut: maxQ <= 0");
         }
     }
 
     protected void doOutlierOut(ArtifactAndFacet aaf, ThemeDocument doc, boolean visible) {
-        logger.debug("doOutlierOut");
+        log.debug("doOutlierOut");
 
         QWI[] qws = (QWI[])aaf.getData(context);
         addQWSeries(qws, aaf, doc, visible);
@@ -492,20 +492,20 @@
 
     /** Add markers for q sectors. */
     protected void doQSectorOut(ArtifactAndFacet aaf, ThemeDocument theme, boolean visible) {
-        logger.debug("doQSectorOut");
+        log.debug("doQSectorOut");
         if (!visible) {
             return;
         }
 
         Object qsectorsObj = aaf.getData(context);
         if (qsectorsObj == null || !(qsectorsObj instanceof List)) {
-            logger.warn("No QSectors coming from data.");
+            log.warn("No QSectors coming from data.");
             return;
         }
 
         List<?> qsectorsList = (List<?>) qsectorsObj;
         if (qsectorsList.size() == 0 || !(qsectorsList.get(0) instanceof NamedDouble)) {
-            logger.warn("No QSectors coming from data.");
+            log.warn("No QSectors coming from data.");
             return;
         }
 
@@ -567,7 +567,7 @@
 
         List<StickyAxisAnnotation> xy = new ArrayList<StickyAxisAnnotation>();
         if (wqkms instanceof double[][]) {
-            logger.debug("Got double[][]");
+            log.debug("Got double[][]");
             double [][] data = (double [][]) wqkms;
             for (int i = 0; i< data[0].length; i++) {
                 xy.add(new StickyAxisAnnotation(aandf.getFacetDescription(),
@@ -579,7 +579,7 @@
         }
         else {
             // Assume its WKms.
-            logger.debug("Got WKms");
+            log.debug("Got WKms");
             WKms data = (WKms) wqkms;
 
             Double ckm = (Double) context.getContextValue(CURRENT_KM);
@@ -613,14 +613,14 @@
         River river = RiverUtils.getRiver(artifact);
 
         if (river == null) {
-            logger.debug("no river found");
+            log.debug("no river found");
             return;
         }
 
         Gauge gauge = river.determineGaugeByName(gaugeName);
 
         if (gauge == null) {
-            logger.debug("no gauge found");
+            log.debug("no gauge found");
             return;
         }
 
@@ -654,16 +654,16 @@
             ThemeDocument    theme,
             boolean          visible
             ) {
-        logger.debug("FixWQCurveGenerator: doWQOut");
+        log.debug("FixWQCurveGenerator: doWQOut");
         if (wqkms instanceof WQKms) {
             // TODO As in doEventsOut, the value-searching should
             // be delivered by the facet already (instead of in the Generator).
-            logger.debug("FixWQCurveGenerator: doWQOut: WQKms");
+            log.debug("FixWQCurveGenerator: doWQOut: WQKms");
 
             addPointFromWQKms((WQKms) aaf.getData(context), aaf.getFacetDescription(), theme, visible);
         }
         else {
-            logger.debug("FixWQCurveGenerator: doWQOut: double[][]");
+            log.debug("FixWQCurveGenerator: doWQOut: double[][]");
             double [][] data = (double [][]) wqkms;
 
             XYSeries series = new StyledXYSeries(aaf.getFacetDescription(), false, true, theme);