--- a/artifacts/src/main/java/org/dive4elements/river/exports/WaterlevelExporter.java	Fri Sep 05 12:54:58 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/WaterlevelExporter.java	Fri Sep 05 12:58:17 2014 +0200
@@ -68,8 +68,8 @@
  */
 public class WaterlevelExporter extends AbstractExporter {
 
-    /** The logger used in this exporter.*/
-    private static Logger logger = Logger.getLogger(WaterlevelExporter.class);
+    /** The log used in this exporter.*/
+    private static Logger log = Logger.getLogger(WaterlevelExporter.class);
 
     public static final String FACET_WST = "wst";
 
@@ -154,7 +154,7 @@
     public void generate()
     throws IOException
     {
-        logger.debug("WaterlevelExporter.generate");
+        log.debug("WaterlevelExporter.generate");
 
         /* Check for official fixings. They should also be included in the
          * export but only the calculation result is added with addData */
@@ -183,7 +183,7 @@
                 }
                 if (!exists) {
                     officalFixings.add(toAdd);
-                    logger.debug("Adding additional offical fixing: " + newName);
+                    log.debug("Adding additional offical fixing: " + newName);
                 }
             }
         }
@@ -228,11 +228,11 @@
      * @param wqkms A WQKms object that should be prepared.
      */
     protected String getColumnTitle(WINFOArtifact winfo, WQKms wqkms) {
-        logger.debug("WaterlevelExporter.getColumnTitle");
+        log.debug("WaterlevelExporter.getColumnTitle");
 
         String name = wqkms.getName();
 
-        logger.debug("Name of WQKms = '" + name + "'");
+        log.debug("Name of WQKms = '" + name + "'");
 
         if (name.indexOf("W=") >= 0) {
             return name;
@@ -251,7 +251,7 @@
                 if (nmv != null && nmv.length() > 0) {
                     nmv  = RiverUtils.stripNamedMainValue(nmv);
                     nmv += "=" + String.valueOf(v);
-                    logger.debug("Set named main value '" + nmv + "'");
+                    log.debug("Set named main value '" + nmv + "'");
 
                     return nmv;
                 }
@@ -266,11 +266,11 @@
 
 
     protected String getCSVRowTitle(WINFOArtifact winfo, WQKms wqkms) {
-        logger.debug("WaterlevelExporter.prepareNamedValue");
+        log.debug("WaterlevelExporter.prepareNamedValue");
 
         String name = wqkms.getName();
 
-        logger.debug("Name of WQKms = '" + name + "'");
+        log.debug("Name of WQKms = '" + name + "'");
 
         WQ_MODE wqmode = RiverUtils.getWQMode(winfo);
 
@@ -284,7 +284,7 @@
 
         if (nmv != null && nmv.length() > 0) {
             nmv = RiverUtils.stripNamedMainValue(nmv);
-            logger.debug("Set named main value '" + nmv + "'");
+            log.debug("Set named main value '" + nmv + "'");
 
             return nmv;
         }
@@ -318,7 +318,7 @@
 
     @Override
     protected void writeCSVData(CSVWriter writer) {
-        logger.info("WaterlevelExporter.writeData");
+        log.info("WaterlevelExporter.writeData");
 
         WQ_MODE mode    = RiverUtils.getWQMode((D4EArtifact)master);
         boolean atGauge = mode == WQ_MODE.QGAUGE || mode == WQ_MODE.WGAUGE;
@@ -377,7 +377,7 @@
      */
     private WQKms filterWQKms(WQKms wqkms, Double first, Double last) {
         if (first.isNaN() || last.isNaN()) {
-            logger.warn("Filtering official fixing without valid first/last.");
+            log.warn("Filtering official fixing without valid first/last.");
             return wqkms;
         }
         int firstIdx = first > last ? wqkms.size() - 1 : 0;
@@ -407,7 +407,7 @@
 
 
     protected void writeCSVMeta(CSVWriter writer) {
-        logger.info("WaterlevelExporter.writeCSVMeta");
+        log.info("WaterlevelExporter.writeCSVMeta");
 
         // TODO use Access instead of RiverUtils
 
@@ -489,7 +489,7 @@
                 }
             }
             else {
-                logger.warn("Could not determine Q range!");
+                log.warn("Could not determine Q range!");
             }
 
             writer.writeNext(new String[] {
@@ -511,7 +511,7 @@
                 upper = String.valueOf(ws[ws.length-1]);
             }
             else {
-                logger.warn("Could not determine W range!");
+                log.warn("Could not determine W range!");
             }
 
             writer.writeNext(new String[] {
@@ -536,7 +536,7 @@
         boolean   atGauge,
         boolean   isQ
     ) {
-        logger.info("WaterlevelExporter.writeCSVHeader");
+        log.info("WaterlevelExporter.writeCSVHeader");
 
         String unit = RiverUtils.getRiver((D4EArtifact) master).getWstUnit().getName();
 
@@ -657,7 +657,7 @@
         boolean   atGauge,
         boolean   isQ
     ) {
-        logger.debug("WaterlevelExporter.wQKms2CSV");
+        log.debug("WaterlevelExporter.wQKms2CSV");
 
         // Skip constant data.
         if (wqkms instanceof ConstantWQKms) {
@@ -751,8 +751,8 @@
 
         long stopTime = System.currentTimeMillis();
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Writing CSV took " +
+        if (log.isDebugEnabled()) {
+            log.debug("Writing CSV took " +
                 (float)(stopTime-startTime)/1000f + " secs.");
         }
     }
@@ -764,7 +764,7 @@
     protected void generateWST()
     throws    IOException
     {
-        logger.info("WaterlevelExporter.generateWST");
+        log.info("WaterlevelExporter.generateWST");
 
         int cols = data.get(0).length + officalFixings.size();
         WstWriter writer = new WstWriter(cols);
@@ -776,7 +776,7 @@
 
 
     protected void writeWSTData(WstWriter writer) {
-        logger.debug("WaterlevelExporter.writeWSTData");
+        log.debug("WaterlevelExporter.writeWSTData");
 
         double[] result = new double[4];
 
@@ -850,7 +850,7 @@
                 }
                 catch (FunctionEvaluationException aode) {
                     // should not happen
-                    logger.error("spline interpolation failed", aode);
+                    log.error("spline interpolation failed", aode);
                     // entry.getValue().add(Double.NaN, entry.getValue().getQ(0));
                 }
             }*/
@@ -895,7 +895,7 @@
 
     @Override
     protected void writePDF(OutputStream out) {
-        logger.debug("write PDF");
+        log.debug("write PDF");
         WKmsJRDataSource source = createJRData();
 
         String jasperFile = Resources.getMsg(
@@ -915,7 +915,7 @@
             JasperExportManager.exportReportToPdfStream(print, out);
         }
         catch(JRException je) {
-            logger.warn("Error generating PDF Report!", je);
+            log.warn("Error generating PDF Report!", je);
         }
     }
 
@@ -993,7 +993,7 @@
         boolean isQ,
         WKmsJRDataSource source)
     {
-        logger.debug("WaterlevelExporter.addWKmsData");
+        log.debug("WaterlevelExporter.addWKmsData");
 
         // Skip constant data.
         if (wqkms instanceof ConstantWQKms) {
@@ -1052,8 +1052,8 @@
 
         long stopTime = System.currentTimeMillis();
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Writing PDF data took " +
+        if (log.isDebugEnabled()) {
+            log.debug("Writing PDF data took " +
                 (float)(stopTime-startTime)/1000f + " secs.");
         }
     }