--- a/artifacts/src/main/java/org/dive4elements/river/exports/ChartGenerator.java	Fri Sep 05 12:54:58 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/ChartGenerator.java	Fri Sep 05 12:58:17 2014 +0200
@@ -89,7 +89,7 @@
  */
 public abstract class ChartGenerator implements OutGenerator {
 
-    private static Logger logger = Logger.getLogger(ChartGenerator.class);
+    private static Logger log = Logger.getLogger(ChartGenerator.class);
 
     public static final int    DEFAULT_CHART_WIDTH     = 600;
     public static final int    DEFAULT_CHART_HEIGHT    = 400;
@@ -163,7 +163,7 @@
 
     @Override
     public void setup(Object config) {
-        logger.debug("ChartGenerator.setup");
+        log.debug("ChartGenerator.setup");
     }
 
     /**
@@ -212,7 +212,7 @@
             AxisDataset dataset = getAxisDataset(
                 new Integer(annotation.getAxisSymbol()));
             if (dataset == null) {
-                logger.warn("Annotation should stick to unfindable y-axis: "
+                log.warn("Annotation should stick to unfindable y-axis: "
                     + annotation.getAxisSymbol());
                 rendererIndex = 0;
             }
@@ -422,10 +422,10 @@
      * @param plot Plot to add annotations to.
      */
     protected void addAnnotationsToRenderer(XYPlot plot) {
-        logger.debug("addAnnotationsToRenderer");
+        log.debug("addAnnotationsToRenderer");
 
         if (annotations == null || annotations.isEmpty()) {
-            logger.debug("addAnnotationsToRenderer: no annotations.");
+            log.debug("addAnnotationsToRenderer: no annotations.");
             return;
         }
 
@@ -610,7 +610,7 @@
         ThemeDocument theme,
         boolean visible
     ){
-        logger.debug("doAnnotations");
+        log.debug("doAnnotations");
 
         // Add all annotations to our annotation pool.
         annotations.setTheme(theme);
@@ -618,7 +618,7 @@
             annotations.setLabel(aandf.getFacetDescription());
         }
         else {
-            logger.error(
+            log.error(
                 "Art/Facet for Annotations is null. " +
                 "This should never happen!");
         }
@@ -636,7 +636,7 @@
     public void generate()
     throws IOException
     {
-        logger.debug("ChartGenerator.generate");
+        log.debug("ChartGenerator.generate");
 
         JFreeChart chart = generateChart();
 
@@ -687,7 +687,7 @@
 
     @Override
     public void init(String outName, Document request, OutputStream out, CallContext context) {
-        logger.debug("ChartGenerator.init");
+        log.debug("ChartGenerator.init");
 
         this.outName = outName;
         this.request = request;
@@ -1301,15 +1301,15 @@
         Bounds[] xyBounds = ChartHelper.getBounds(dataset);
 
         if (xyBounds == null) {
-            logger.warn("Skip XYDataset for Axis (invalid ranges): " + idx);
+            log.warn("Skip XYDataset for Axis (invalid ranges): " + idx);
             return;
         }
 
         if (visible) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("Add new AxisDataset at index: " + idx);
-                logger.debug("X extent: " + xyBounds[0]);
-                logger.debug("Y extent: " + xyBounds[1]);
+            if (log.isDebugEnabled()) {
+                log.debug("Add new AxisDataset at index: " + idx);
+                log.debug("X extent: " + xyBounds[0]);
+                log.debug("Y extent: " + xyBounds[1]);
             }
 
             axisDataset.addDataset(dataset);
@@ -1461,7 +1461,7 @@
                     size[1] = Integer.parseInt(h);
                 }
                 catch (NumberFormatException nfe) {
-                    logger.warn("Wrong values for chart width/height.");
+                    log.warn("Wrong values for chart width/height.");
                 }
             }
         }
@@ -1559,7 +1559,7 @@
      * @param plot plot to add datasets to.
      */
     protected void addDatasets(XYPlot plot) {
-        logger.debug("addDatasets()");
+        log.debug("addDatasets()");
 
         // AxisDatasets are sorted, but some might be empty.
         // Thus, generate numbering on the fly.
@@ -1631,7 +1631,7 @@
      * @param idx The index of the renderer / dataset.
      */
     protected void applyLineTheme(XYPlot plot, XYDataset dataset, int idx) {
-        logger.debug("Apply LineTheme for dataset at index: " + idx);
+        log.debug("Apply LineTheme for dataset at index: " + idx);
 
         LegendItemCollection lic  = new LegendItemCollection();
         LegendItemCollection anno = plot.getFixedLegendItems();
@@ -1666,7 +1666,7 @@
                 lic.add(legendItem);
             }
             else {
-                logger.warn("Could not get LegentItem for renderer: "
+                log.warn("Could not get LegentItem for renderer: "
                     + idx + ", series-idx " + s);
             }
         }
@@ -1696,7 +1696,7 @@
 
         Font legendFont = createLegendLabelFont();
 
-        logger.debug("Registering an 'area'renderer at idx: " + idx);
+        log.debug("Registering an 'area'renderer at idx: " + idx);
 
         StableXYDifferenceRenderer dRenderer =
             new StableXYDifferenceRenderer();
@@ -1721,7 +1721,7 @@
             lic.add(legendItem);
         }
         else {
-            logger.warn("Could not get LegentItem for renderer: "
+            log.warn("Could not get LegentItem for renderer: "
                 + idx + ", series-idx " + 0);
         }
 
@@ -1762,7 +1762,7 @@
      * @return a new instance of EnhancedLineAndShapeRenderer.
      */
     protected XYLineAndShapeRenderer createRenderer(XYPlot plot, int idx) {
-        logger.debug("Create EnhancedLineAndShapeRenderer for idx: " + idx);
+        log.debug("Create EnhancedLineAndShapeRenderer for idx: " + idx);
 
         EnhancedLineAndShapeRenderer r =
             new EnhancedLineAndShapeRenderer(true, false);