--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/DataFactory.java	Fri Sep 05 12:58:17 2014 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/DataFactory.java	Fri Sep 05 13:19:22 2014 +0200
@@ -43,7 +43,7 @@
  */
 public class DataFactory {
 
-    private static final Logger logger = Logger.getLogger(DataFactory.class);
+    private static final Logger log = Logger.getLogger(DataFactory.class);
 
     public static final String NS_URI = ArtifactNamespaceContext.NAMESPACE_URI;
 
@@ -64,7 +64,7 @@
         label = label != null && label.length() > 0 ? label : name;
 
         try {
-            logger.debug("Create Data instance for: " + name + " | " + type);
+            log.debug("Create Data instance for: " + name + " | " + type);
 
             if (type == null || type.length() == 0) {
                 return createDefaultData(element, name, label);
@@ -104,7 +104,7 @@
             }
         }
         catch (Exception e) {
-            logger.error("Error while data creation for: " + name);
+            log.error("Error while data creation for: " + name);
         }
 
         return null;
@@ -127,7 +127,7 @@
         NodeList nl = element.getElementsByTagName("meta");
         int N = nl.getLength();
         if (N < 1) {
-            logger.debug("No meta data found for multi attribute data");
+            log.debug("No meta data found for multi attribute data");
             return Collections.<String, Map<String, String>>emptyMap();
         }
         Map<String, Map<String, String>> map =
@@ -156,7 +156,7 @@
             ArtifactNamespaceContext.INSTANCE);
 
         if (itemList == null || itemList.getLength() == 0) {
-            logger.debug("No old data items found.");
+            log.debug("No old data items found.");
             return null;
         }
 
@@ -193,7 +193,7 @@
      * @return an instance of DefaultData.
      */
     protected static Data createDefaultData(Element ele, String name, String label) {
-        logger.debug("Create new DefaultData");
+        log.debug("Create new DefaultData");
         return new DefaultData(name, label, "default", extractDataItems(ele));
     }
 
@@ -313,7 +313,7 @@
                 doubles[i] = Double.valueOf(values[i]);
             }
             catch (NumberFormatException nfe) {
-                logger.warn("Error while parsing DoubleArrayData: " + nfe);
+                log.warn("Error while parsing DoubleArrayData: " + nfe);
             }
         }
 
@@ -336,7 +336,7 @@
             ArtifactNamespaceContext.INSTANCE);
 
         if (itemList == null || itemList.getLength() == 0) {
-            logger.debug("No data items found.");
+            log.debug("No data items found.");
             return null;
         }
 
@@ -344,7 +344,7 @@
 
         DataItem[] items = new DataItem[count];
 
-        logger.debug("There are " + count + " data items in element.");
+        log.debug("There are " + count + " data items in element.");
 
         for (int i = 0; i < count; i++) {
             Element tmp = (Element) itemList.item(i);
@@ -352,9 +352,9 @@
             String value = tmp.getAttributeNS(NS_URI, "value");
             String label = tmp.getAttributeNS(NS_URI, "label");
 
-            logger.debug("Found data item:");
-            logger.debug("   label: " + label);
-            logger.debug("   value: " + value);
+            log.debug("Found data item:");
+            log.debug("   label: " + label);
+            log.debug("   value: " + value);
 
             items[i] = new DefaultDataItem(label, label, value);
         }
@@ -378,7 +378,7 @@
             ArtifactNamespaceContext.INSTANCE);
 
         if (itemList == null || itemList.getLength() == 0) {
-            logger.debug("No old data items found.");
+            log.debug("No old data items found.");
             return null;
         }
 
@@ -397,7 +397,7 @@
                  items[i] = new IntDataItem(label, label, data);
              }
              catch(NumberFormatException nfe) {
-                 logger.debug(nfe, nfe);
+                 log.debug(nfe, nfe);
              }
          }
          return items;