--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation4.java	Fri Sep 05 12:54:58 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/Calculation4.java	Fri Sep 05 12:58:17 2014 +0200
@@ -30,7 +30,7 @@
 public class Calculation4
 extends      Calculation
 {
-    private static Logger logger = Logger.getLogger(Calculation4.class);
+    private static Logger log = Logger.getLogger(Calculation4.class);
 
     public static final double MINIMAL_STEP_WIDTH = 1e-5;
 
@@ -46,7 +46,7 @@
     }
 
     public Calculation4(Calculation4Access access) {
-        logger.debug("Calculation4Access.cnst");
+        log.debug("Calculation4Access.cnst");
         String        river    = access.getRiverName();
         List<Segment> segments = access.getSegments();
         double []     range    = access.getFromToStep();
@@ -100,21 +100,21 @@
     }
 
     protected CalculationResult innerCalculate(WstValueTable table) {
-        boolean debug = logger.isDebugEnabled();
+        boolean debug = log.isDebugEnabled();
 
         if (debug) {
-            logger.debug(
+            log.debug(
                 "calculate from " + from + " to " + to + " step " + step);
-            logger.debug("# segments: " + segments.size());
+            log.debug("# segments: " + segments.size());
             for (Segment segment: segments) {
-                logger.debug("  " + segment);
+                log.debug("  " + segment);
             }
         }
 
         int numResults = segments.get(0).values.length;
 
         if (numResults < 1) {
-            logger.debug("no values given");
+            log.debug("no values given");
             addProblem("no.values.given");
             return new CalculationResult(new WQKms[0], this);
         }
@@ -148,13 +148,13 @@
         ) {
             if (pos < s1.referencePoint || pos > s2.referencePoint) {
                 if (debug) {
-                    logger.debug("need to find new interval for " + pos);
+                    log.debug("need to find new interval for " + pos);
                 }
                 // find new interval
                 if (pos <= segments.get(0).referencePoint) {
                     // before first segment -> "gleichwertig"
                     if (debug) {
-                        logger.debug("before first segment -> gleichwertig");
+                        log.debug("before first segment -> gleichwertig");
                     }
                     Segment   first  = segments.get(0);
                     double [] values = first.values;
@@ -171,7 +171,7 @@
                 else if (pos >= segments.get(segments.size()-1).referencePoint) {
                     // after last segment -> "gleichwertig"
                     if (debug) {
-                        logger.debug("after last segment -> gleichwertig");
+                        log.debug("after last segment -> gleichwertig");
                     }
                     Segment   last   = segments.get(segments.size()-1);
                     double [] values = last.values;
@@ -188,14 +188,14 @@
                 else { // "ungleichwertig"
                     // find matching interval
                     if (debug) {
-                        logger.debug("in segments -> ungleichwertig");
+                        log.debug("in segments -> ungleichwertig");
                     }
                     s1 = s2 = null;
                     for (int i = 1, N = segments.size(); i < N; ++i) {
                         Segment si1 = segments.get(i-1);
                         Segment si  = segments.get(i);
                         if (debug) {
-                            logger.debug("check " + pos + " in " +
+                            log.debug("check " + pos + " in " +
                                 si1.referencePoint + " - " + si.referencePoint);
                         }
                         if (pos >= si1.referencePoint
@@ -236,7 +236,7 @@
                                     anchor.values[i], free.values[i]);
 
                             if (debug) {
-                                logger.debug(
+                                log.debug(
                                     anchor.referencePoint + ": " +
                                     qA + " -> " + functions[i].value(qA) +
                                     " / " + free.referencePoint + ": " +