--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WQSelect.java	Fri Sep 05 12:54:58 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WQSelect.java	Fri Sep 05 12:58:17 2014 +0200
@@ -45,8 +45,8 @@
  */
 public class WQSelect extends DefaultState {
 
-    /** The logger used in this class. */
-    private static Logger logger = Logger.getLogger(WQSelect.class);
+    /** The log used in this class. */
+    private static Logger log = Logger.getLogger(WQSelect.class);
 
     /** The default step width for Qs. */
     public static final String DEFAULT_STEP_Q = "50";
@@ -180,7 +180,7 @@
 
         Gauge gauge = winfo.getGauge();
 
-        boolean debug = logger.isDebugEnabled();
+        boolean debug = log.isDebugEnabled();
 
         StringBuilder label = new StringBuilder();
 
@@ -194,7 +194,7 @@
                 if (mv != null && mv.length() > 0) {
                     tmp = mv + ": " + tmp;
                     if (debug) {
-                        logger.debug("Add main value: '" + mv + "'");
+                        log.debug("Add main value: '" + mv + "'");
                     }
                 }
                 if (label.length() > 0) {
@@ -399,7 +399,7 @@
      * @return the min and max W values for the current gauge.
      */
     protected double[] determineMinMaxW(Artifact artifact) {
-        logger.debug("WQSelect.determineCurrentGauge");
+        log.debug("WQSelect.determineCurrentGauge");
 
         Gauge    gauge   = ((WINFOArtifact) artifact).getGauge();
         double[] minmaxW = gauge != null ? gauge.determineMinMaxW() : null;
@@ -421,7 +421,7 @@
      * @return the min and max W values.
      */
     protected double[] determineMinMaxWFree(Artifact artifact) {
-        logger.debug("WQSelect.determineMinMaxWFree");
+        log.debug("WQSelect.determineMinMaxWFree");
 
         WINFOArtifact winfo = (WINFOArtifact) artifact;
         WstValueTable valueTable = WstValueTableFactory.getTable(
@@ -456,7 +456,7 @@
      * @return the min and max Q values for the current gauge.
      */
     protected double[] determineMinMaxQAtGauge(Artifact artifact) {
-        logger.debug("WQSelect.determineMinMaxQAtGauge");
+        log.debug("WQSelect.determineMinMaxQAtGauge");
 
         WINFOArtifact flysArtifact = (WINFOArtifact) artifact;
 
@@ -484,7 +484,7 @@
      * @return the min and max Q values for the current kilometer range.
      */
     protected double[] determineMinMaxQ(Artifact artifact) {
-        logger.debug("WQSelect.determineMinMaxQ");
+        log.debug("WQSelect.determineMinMaxQ");
 
         WINFOArtifact winfo = (WINFOArtifact) artifact;
         WstValueTable valueTable = WstValueTableFactory.getTable(
@@ -521,7 +521,7 @@
     public boolean validate(Artifact artifact)
     throws IllegalArgumentException
     {
-        logger.debug("WQSelect.validate");
+        log.debug("WQSelect.validate");
 
         WINFOArtifact flys = (WINFOArtifact) artifact;
 
@@ -546,15 +546,15 @@
         double from,      double to,      double step)
     throws IllegalArgumentException
     {
-        logger.debug("RangeState.validateRange");
+        log.debug("RangeState.validateRange");
 
         if (from < fromValid) {
-            logger.error(
+            log.error(
                 "Invalid 'from'. " + from + " is smaller than " + fromValid);
             throw new IllegalArgumentException("error_feed_from_out_of_range");
         }
         else if (to > toValid) {
-            logger.error(
+            log.error(
                 "Invalid 'to'. " + to + " is bigger than " + toValid);
             throw new IllegalArgumentException("error_feed_to_out_of_range");
         }
@@ -566,7 +566,7 @@
     protected boolean validateSingle(Artifact artifact)
     throws    IllegalArgumentException
     {
-        logger.debug("WQSelect.validateSingle");
+        log.debug("WQSelect.validateSingle");
 
         WINFOArtifact flys = (WINFOArtifact) artifact;
         StateData    data = getData(flys, WQ_SINGLE);
@@ -585,7 +585,7 @@
                 all.add(Double.parseDouble(strValue));
             }
             catch (NumberFormatException nfe) {
-                logger.warn(nfe, nfe);
+                log.warn(nfe, nfe);
             }
         }
 
@@ -593,7 +593,7 @@
 
         RiverUtils.WQ_MODE mode = RiverUtils.getWQMode(flys);
 
-        logger.debug("WQ Mode: " + mode);
+        log.debug("WQ Mode: " + mode);
 
         double[] minmax = null;
 
@@ -613,8 +613,8 @@
         double min = all.get(0);
         double max = all.get(all.size()-1);
 
-        logger.debug("Inserted min value = " + min);
-        logger.debug("Inserted max value = " + max);
+        log.debug("Inserted min value = " + min);
+        log.debug("Inserted max value = " + max);
 
         return validateBounds(minmax[0], minmax[1], min, max, 0d);
     }
@@ -623,7 +623,7 @@
     protected boolean validateRange(Artifact artifact)
     throws    IllegalArgumentException
     {
-        logger.debug("WQSelect.validateRange");
+        log.debug("WQSelect.validateRange");
 
         WINFOArtifact     flys = (WINFOArtifact) artifact;
         RiverUtils.WQ_MODE mode = RiverUtils.getWQMode(flys);
@@ -689,7 +689,7 @@
         double step)
     throws    IllegalArgumentException
     {
-        logger.debug("WQSelect.validateGaugeW");
+        log.debug("WQSelect.validateGaugeW");
 
         double[] minmaxW = determineMinMaxW(artifact);
 
@@ -715,7 +715,7 @@
         double   step)
     throws IllegalArgumentException
     {
-        logger.debug("WQSelect.validateGaugeQ");
+        log.debug("WQSelect.validateGaugeQ");
 
         double[] minmaxQ = determineMinMaxQAtGauge(artifact);
 
@@ -741,7 +741,7 @@
         double   step)
     throws IllegalArgumentException
     {
-        logger.debug("WQSelect.validateFreeQ");
+        log.debug("WQSelect.validateFreeQ");
 
         double[] minmaxQ = determineMinMaxQ(artifact);
 
@@ -767,7 +767,7 @@
         double   step)
     throws IllegalArgumentException
     {
-        logger.debug("WQSelect.validateFreeW");
+        log.debug("WQSelect.validateFreeW");
 
         double[] minmaxW = determineMinMaxWFree(artifact);