--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/MainValuesArtifact.java	Fri Sep 05 12:54:58 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/MainValuesArtifact.java	Fri Sep 05 12:58:17 2014 +0200
@@ -56,8 +56,8 @@
 extends      StaticD4EArtifact
 implements   FacetTypes
 {
-    /** The logger for this class. */
-    private static Logger logger = Logger.getLogger(MainValuesArtifact.class);
+    /** The log for this class. */
+    private static Logger log = Logger.getLogger(MainValuesArtifact.class);
 
     /** The name of the artifact. */
     public static final String ARTIFACT_NAME = "mainvalue";
@@ -94,7 +94,7 @@
      * Trivial Constructor.
      */
     public MainValuesArtifact() {
-        logger.debug("MainValuesArtifact.MainValuesartifact()");
+        log.debug("MainValuesArtifact.MainValuesartifact()");
     }
 
 
@@ -110,7 +110,7 @@
         Document        data,
         List<Class>     loadFacets)
     {
-        logger.debug("MainValuesArtifact.setup");
+        log.debug("MainValuesArtifact.setup");
         state = new StaticState(STATIC_STATE_NAME);
 
         initFromGaugeDoc(data, callMeta);
@@ -120,7 +120,7 @@
         spawnState();
         super.setup(identifier, factory, context, callMeta, data, loadFacets);
         String restriction = getDatacageIDValue(data);
-        logger.debug("mainvalue restriction " + restriction);
+        log.debug("mainvalue restriction " + restriction);
         boolean restricted = restriction.endsWith("q") || restriction.endsWith("w");
         if (!restricted || restriction.endsWith("q")) {
             Facet qfacet0 = new MainValuesQFacet(
@@ -201,7 +201,7 @@
 
         if (rivername == null || gaugeref == null || rivername.equals("")
             || gaugeref.equals("")) {
-            logger.debug("Not setting MainValuesArtifact up from gauge doc.");
+            log.debug("Not setting MainValuesArtifact up from gauge doc.");
             return;
         }
 
@@ -217,7 +217,7 @@
             addData("ld_locations", new DefaultStateData("ld_locations", null, null,
                     String.valueOf(gauge.getStation())));
         } catch (NumberFormatException nfe) {
-            logger.debug("MainValuesArtifact could not parse gaugeref from doc.");
+            log.debug("MainValuesArtifact could not parse gaugeref from doc.");
         }
     }
 
@@ -243,7 +243,7 @@
     /** Get important data from the 'calling' artifact. */
     @Override
     protected void initialize(Artifact artifact, Object context, CallMeta meta) {
-        logger.debug("MainValuesArtifact.initialize");
+        log.debug("MainValuesArtifact.initialize");
         D4EArtifact winfo = (D4EArtifact) artifact;
         RangeAccess rangeAccess = new RangeAccess(winfo);
         double [] locations = rangeAccess.getKmRange();
@@ -254,7 +254,7 @@
                     String.valueOf(location)));
         }
         else {
-            logger.error("No location for mainvalues given.");
+            log.error("No location for mainvalues given.");
         }
         importData(winfo, "river");
         // In the case of DischargeWQCurves, there are no locations, but a gauge.
@@ -268,7 +268,7 @@
                     String.valueOf(g.getStation())));
             }
             else {
-                logger.error("MainValuesArtifact: No location/gauge.");
+                log.error("MainValuesArtifact: No location/gauge.");
             }
         }
     }
@@ -330,7 +330,7 @@
         River river = RiverUtils.getRiver(this);
 
         if (river == null) {
-            logger.error("River is null");
+            log.error("River is null");
             return null;
         }
 
@@ -349,12 +349,12 @@
         String locationStr = getDataAsString("ld_locations");
 
         if (river == null) {
-            logger.error("River is null");
+            log.error("River is null");
             return null;
         }
 
         if (locationStr == null) {
-            logger.error("Locationstr is null");
+            log.error("Locationstr is null");
             return null;
         }
 
@@ -379,7 +379,7 @@
      * @return list of Q main values.
      */
     public List<NamedDouble> getMainValuesQ(double[] kms) {
-        logger.debug("MainValuesArtifact.getMainValuesQ(d)");
+        log.debug("MainValuesArtifact.getMainValuesQ(d)");
         List<NamedDouble> filteredList = new ArrayList<NamedDouble>();
         boolean atGauge = false;
         Gauge gauge = getGauge(kms[0]);
@@ -416,7 +416,7 @@
      * @return list of Q main values.
      */
     public List<NamedDouble> getMainValuesQ(boolean atGauge) {
-        logger.debug("MainValuesArtifact.getMainValuesQ(b)");
+        log.debug("MainValuesArtifact.getMainValuesQ(b)");
         List<NamedDouble> filteredList = new ArrayList<NamedDouble>();
         Gauge gauge = getGauge();
         WstValueTable interpolator = WstValueTableFactory.getTable(RiverUtils.getRiver(this));