#8297 Do not use static logger instances

svn changeset:23882/svn branch:6.8

22 files changed, 341 insertions, 266 deletions

diff --git a/src/com/vaadin/Application.java b/src/com/vaadin/Application.java
index 9fb4cfe7fa..a41cff36cb 100644
--- a/src/com/vaadin/Application.java
+++ b/src/com/vaadin/Application.java
@@ -92,9 +92,6 @@ import com.vaadin.ui.Window;
 public abstract class Application implements URIHandler,
         Terminal.ErrorListener, Serializable {
 
-    private final static Logger logger = Logger.getLogger(Application.class
-            .getName());
-
     /**
      * Id use for the next window that is opened. Access to this must be
      * synchronized.
@@ -1191,8 +1188,9 @@ public abstract class Application implements URIHandler,
         final Throwable t = event.getThrowable();
         if (t instanceof SocketException) {
             // Most likely client browser closed socket
-            logger.info("SocketException in CommunicationManager."
-                    + " Most likely client (browser) closed socket.");
+            getLogger().info(
+                    "SocketException in CommunicationManager."
+                            + " Most likely client (browser) closed socket.");
             return;
         }
 
@@ -1219,7 +1217,7 @@ public abstract class Application implements URIHandler,
         }
 
         // also print the error on console
-        logger.log(Level.SEVERE, "Terminal error:", t);
+        getLogger().log(Level.SEVERE, "Terminal error:", t);
     }
 
     /**
@@ -1906,4 +1904,8 @@ public abstract class Application implements URIHandler,
         }
 
     }
+
+    private static final Logger getLogger() {
+        return Logger.getLogger(Application.class.getName());
+    }
 }
\ No newline at end of file
diff --git a/src/com/vaadin/data/util/MethodProperty.java b/src/com/vaadin/data/util/MethodProperty.java
index ff258d3e0f..777ce68790 100644
--- a/src/com/vaadin/data/util/MethodProperty.java
+++ b/src/com/vaadin/data/util/MethodProperty.java
@@ -49,8 +49,6 @@ import com.vaadin.util.SerializerHelper;
 @SuppressWarnings("serial")
 public class MethodProperty<T> extends AbstractProperty {
 
-    private static final Logger logger = Logger.getLogger(MethodProperty.class
-            .getName());
     /**
      * The object that includes the property the MethodProperty is bound to.
      */
@@ -131,9 +129,9 @@ public class MethodProperty<T> extends AbstractProperty {
                 getMethod = null;
             }
         } catch (SecurityException e) {
-            logger.log(Level.SEVERE, "Internal deserialization error", e);
+            getLogger().log(Level.SEVERE, "Internal deserialization error", e);
         } catch (NoSuchMethodException e) {
-            logger.log(Level.SEVERE, "Internal deserialization error", e);
+            getLogger().log(Level.SEVERE, "Internal deserialization error", e);
         }
     };
 
@@ -805,4 +803,7 @@ public class MethodProperty<T> extends AbstractProperty {
         super.fireValueChange();
     }
 
+    private static final Logger getLogger() {
+        return Logger.getLogger(MethodProperty.class.getName());
+    }
 }
diff --git a/src/com/vaadin/data/util/MethodPropertyDescriptor.java b/src/com/vaadin/data/util/MethodPropertyDescriptor.java
index f0c879766b..c4ec515917 100644
--- a/src/com/vaadin/data/util/MethodPropertyDescriptor.java
+++ b/src/com/vaadin/data/util/MethodPropertyDescriptor.java
@@ -23,9 +23,6 @@ import com.vaadin.util.SerializerHelper;
 public class MethodPropertyDescriptor<BT> implements
         VaadinPropertyDescriptor<BT> {
 
-    private static final Logger logger = Logger
-            .getLogger(MethodPropertyDescriptor.class.getName());
-
     private final String name;
     private Class<?> propertyType;
     private transient Method readMethod;
@@ -109,9 +106,9 @@ public class MethodPropertyDescriptor<BT> implements
                 readMethod = null;
             }
         } catch (SecurityException e) {
-            logger.log(Level.SEVERE, "Internal deserialization error", e);
+            getLogger().log(Level.SEVERE, "Internal deserialization error", e);
         } catch (NoSuchMethodException e) {
-            logger.log(Level.SEVERE, "Internal deserialization error", e);
+            getLogger().log(Level.SEVERE, "Internal deserialization error", e);
         }
     };
 
@@ -128,4 +125,8 @@ public class MethodPropertyDescriptor<BT> implements
                 writeMethod);
     }
 
+    private static final Logger getLogger() {
+        return Logger.getLogger(MethodPropertyDescriptor.class.getName());
+    }
+
 }
\ No newline at end of file
diff --git a/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java b/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
index 7eb67437e0..242a977614 100644
--- a/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
+++ b/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
@@ -36,9 +36,6 @@ import com.vaadin.data.util.sqlcontainer.query.generator.OracleGenerator;
 public class SQLContainer implements Container, Container.Filterable,
         Container.Indexed, Container.Sortable, Container.ItemSetChangeNotifier {
 
-    private static final Logger logger = Logger.getLogger(SQLContainer.class
-            .getName());
-
     /** Query delegate */
     private QueryDelegate delegate;
     /** Auto commit mode, default = false */
@@ -162,15 +159,15 @@ public class SQLContainer implements Container, Container.Filterable,
                 if (notificationsEnabled) {
                     CacheFlushNotifier.notifyOfCacheFlush(this);
                 }
-                logger.log(Level.FINER, "Row added to DB...");
+                getLogger().log(Level.FINER, "Row added to DB...");
                 return itemId;
             } catch (SQLException e) {
-                logger.log(Level.WARNING,
+                getLogger().log(Level.WARNING,
                         "Failed to add row to DB. Rolling back.", e);
                 try {
                     delegate.rollback();
                 } catch (SQLException ee) {
-                    logger.log(Level.SEVERE,
+                    getLogger().log(Level.SEVERE,
                             "Failed to roll back row addition", e);
                 }
                 return null;
@@ -215,7 +212,7 @@ public class SQLContainer implements Container, Container.Filterable,
                 return delegate.containsRowWithKey(((RowId) itemId).getId());
             } catch (Exception e) {
                 /* Query failed, just return false. */
-                logger.log(Level.WARNING, "containsId query failed", e);
+                getLogger().log(Level.WARNING, "containsId query failed", e);
             }
         }
         return false;
@@ -325,17 +322,18 @@ public class SQLContainer implements Container, Container.Filterable,
             rs.close();
             delegate.commit();
         } catch (SQLException e) {
-            logger.log(Level.WARNING, "getItemIds() failed, rolling back.", e);
+            getLogger().log(Level.WARNING,
+                    "getItemIds() failed, rolling back.", e);
             try {
                 delegate.rollback();
             } catch (SQLException e1) {
-                logger.log(Level.SEVERE, "Failed to roll back state", e1);
+                getLogger().log(Level.SEVERE, "Failed to roll back state", e1);
             }
             try {
                 rs.getStatement().close();
                 rs.close();
             } catch (SQLException e1) {
-                logger.log(Level.WARNING, "Closing session failed", e1);
+                getLogger().log(Level.WARNING, "Closing session failed", e1);
             }
             throw new RuntimeException("Failed to fetch item indexes.", e);
         }
@@ -400,29 +398,29 @@ public class SQLContainer implements Container, Container.Filterable,
                     CacheFlushNotifier.notifyOfCacheFlush(this);
                 }
                 if (success) {
-                    logger.log(Level.FINER, "Row removed from DB...");
+                    getLogger().log(Level.FINER, "Row removed from DB...");
                 }
                 return success;
             } catch (SQLException e) {
-                logger.log(Level.WARNING, "Failed to remove row, rolling back",
-                        e);
+                getLogger().log(Level.WARNING,
+                        "Failed to remove row, rolling back", e);
                 try {
                     delegate.rollback();
                 } catch (SQLException ee) {
                     /* Nothing can be done here */
-                    logger.log(Level.SEVERE, "Failed to rollback row removal",
-                            ee);
+                    getLogger().log(Level.SEVERE,
+                            "Failed to rollback row removal", ee);
                 }
                 return false;
             } catch (OptimisticLockException e) {
-                logger.log(Level.WARNING, "Failed to remove row, rolling back",
-                        e);
+                getLogger().log(Level.WARNING,
+                        "Failed to remove row, rolling back", e);
                 try {
                     delegate.rollback();
                 } catch (SQLException ee) {
                     /* Nothing can be done here */
-                    logger.log(Level.SEVERE, "Failed to rollback row removal",
-                            ee);
+                    getLogger().log(Level.SEVERE,
+                            "Failed to rollback row removal", ee);
                 }
                 throw e;
             }
@@ -452,7 +450,7 @@ public class SQLContainer implements Container, Container.Filterable,
                 }
                 if (success) {
                     delegate.commit();
-                    logger.log(Level.FINER, "All rows removed from DB...");
+                    getLogger().log(Level.FINER, "All rows removed from DB...");
                     refresh();
                     if (notificationsEnabled) {
                         CacheFlushNotifier.notifyOfCacheFlush(this);
@@ -462,23 +460,23 @@ public class SQLContainer implements Container, Container.Filterable,
                 }
                 return success;
             } catch (SQLException e) {
-                logger.log(Level.WARNING,
+                getLogger().log(Level.WARNING,
                         "removeAllItems() failed, rolling back", e);
                 try {
                     delegate.rollback();
                 } catch (SQLException ee) {
                     /* Nothing can be done here */
-                    logger.log(Level.SEVERE, "Failed to roll back", ee);
+                    getLogger().log(Level.SEVERE, "Failed to roll back", ee);
                 }
                 return false;
             } catch (OptimisticLockException e) {
-                logger.log(Level.WARNING,
+                getLogger().log(Level.WARNING,
                         "removeAllItems() failed, rolling back", e);
                 try {
                     delegate.rollback();
                 } catch (SQLException ee) {
                     /* Nothing can be done here */
-                    logger.log(Level.SEVERE, "Failed to roll back", ee);
+                    getLogger().log(Level.SEVERE, "Failed to roll back", ee);
                 }
                 throw e;
             }
@@ -743,7 +741,7 @@ public class SQLContainer implements Container, Container.Filterable,
                 try {
                     asc = ascending[i];
                 } catch (Exception e) {
-                    logger.log(Level.WARNING, "", e);
+                    getLogger().log(Level.WARNING, "", e);
                 }
                 sorters.add(new OrderBy((String) propertyId[i], asc));
             }
@@ -872,7 +870,8 @@ public class SQLContainer implements Container, Container.Filterable,
      */
     public void commit() throws UnsupportedOperationException, SQLException {
         try {
-            logger.log(Level.FINER, "Commiting changes through delegate...");
+            getLogger().log(Level.FINER,
+                    "Commiting changes through delegate...");
             delegate.beginTransaction();
             /* Perform buffered deletions */
             for (RowItem item : removedItems.values()) {
@@ -926,7 +925,7 @@ public class SQLContainer implements Container, Container.Filterable,
      * @throws SQLException
      */
     public void rollback() throws UnsupportedOperationException, SQLException {
-        logger.log(Level.FINE, "Rolling back changes...");
+        getLogger().log(Level.FINE, "Rolling back changes...");
         removedItems.clear();
         addedItems.clear();
         modifiedItems.clear();
@@ -956,15 +955,15 @@ public class SQLContainer implements Container, Container.Filterable,
                 if (notificationsEnabled) {
                     CacheFlushNotifier.notifyOfCacheFlush(this);
                 }
-                logger.log(Level.FINER, "Row updated to DB...");
+                getLogger().log(Level.FINER, "Row updated to DB...");
             } catch (SQLException e) {
-                logger.log(Level.WARNING,
+                getLogger().log(Level.WARNING,
                         "itemChangeNotification failed, rolling back...", e);
                 try {
                     delegate.rollback();
                 } catch (SQLException ee) {
                     /* Nothing can be done here */
-                    logger.log(Level.SEVERE, "Rollback failed", e);
+                    getLogger().log(Level.SEVERE, "Rollback failed", e);
                 }
                 throw new RuntimeException(e);
             }
@@ -1009,13 +1008,13 @@ public class SQLContainer implements Container, Container.Filterable,
             try {
                 delegate.setFilters(filters);
             } catch (UnsupportedOperationException e) {
-                logger.log(Level.FINE,
+                getLogger().log(Level.FINE,
                         "The query delegate doesn't support filtering", e);
             }
             try {
                 delegate.setOrderBy(sorters);
             } catch (UnsupportedOperationException e) {
-                logger.log(Level.FINE,
+                getLogger().log(Level.FINE,
                         "The query delegate doesn't support filtering", e);
             }
             int newSize = delegate.getCount();
@@ -1025,7 +1024,8 @@ public class SQLContainer implements Container, Container.Filterable,
             }
             sizeUpdated = new Date();
             sizeDirty = false;
-            logger.log(Level.FINER, "Updated row count. New count is: " + size);
+            getLogger().log(Level.FINER,
+                    "Updated row count. New count is: " + size);
         } catch (SQLException e) {
             throw new RuntimeException("Failed to update item set size.", e);
         }
@@ -1069,7 +1069,7 @@ public class SQLContainer implements Container, Container.Filterable,
                     try {
                         type = Class.forName(rsmd.getColumnClassName(i));
                     } catch (Exception e) {
-                        logger.log(Level.WARNING, "Class not found", e);
+                        getLogger().log(Level.WARNING, "Class not found", e);
                         /* On failure revert to Object and hope for the best. */
                         type = Object.class;
                     }
@@ -1095,14 +1095,14 @@ public class SQLContainer implements Container, Container.Filterable,
             rs.getStatement().close();
             rs.close();
             delegate.commit();
-            logger.log(Level.FINER, "Property IDs fetched.");
+            getLogger().log(Level.FINER, "Property IDs fetched.");
         } catch (SQLException e) {
-            logger.log(Level.WARNING,
+            getLogger().log(Level.WARNING,
                     "Failed to fetch property ids, rolling back", e);
             try {
                 delegate.rollback();
             } catch (SQLException e1) {
-                logger.log(Level.SEVERE, "Failed to roll back", e1);
+                getLogger().log(Level.SEVERE, "Failed to roll back", e1);
             }
             try {
                 if (rs != null) {
@@ -1112,7 +1112,7 @@ public class SQLContainer implements Container, Container.Filterable,
                     rs.close();
                 }
             } catch (SQLException e1) {
-                logger.log(Level.WARNING, "Failed to close session", e1);
+                getLogger().log(Level.WARNING, "Failed to close session", e1);
             }
             throw e;
         }
@@ -1135,7 +1135,7 @@ public class SQLContainer implements Container, Container.Filterable,
             } catch (UnsupportedOperationException e) {
                 /* The query delegate doesn't support sorting. */
                 /* No need to do anything. */
-                logger.log(Level.FINE,
+                getLogger().log(Level.FINE,
                         "The query delegate doesn't support sorting", e);
             }
             delegate.beginTransaction();
@@ -1217,14 +1217,17 @@ public class SQLContainer implements Container, Container.Filterable,
             rs.getStatement().close();
             rs.close();
             delegate.commit();
-            logger.log(Level.FINER, "Fetched " + pageLength * CACHE_RATIO
-                    + " rows starting from " + currentOffset);
+            getLogger().log(
+                    Level.FINER,
+                    "Fetched " + pageLength * CACHE_RATIO
+                            + " rows starting from " + currentOffset);
         } catch (SQLException e) {
-            logger.log(Level.WARNING, "Failed to fetch rows, rolling back", e);
+            getLogger().log(Level.WARNING,
+                    "Failed to fetch rows, rolling back", e);
             try {
                 delegate.rollback();
             } catch (SQLException e1) {
-                logger.log(Level.SEVERE, "Failed to roll back", e1);
+                getLogger().log(Level.SEVERE, "Failed to roll back", e1);
             }
             try {
                 if (rs != null) {
@@ -1234,7 +1237,7 @@ public class SQLContainer implements Container, Container.Filterable,
                     }
                 }
             } catch (SQLException e1) {
-                logger.log(Level.WARNING, "Failed to close session", e1);
+                getLogger().log(Level.WARNING, "Failed to close session", e1);
             }
             throw new RuntimeException("Failed to fetch page.", e);
         }
@@ -1577,7 +1580,8 @@ public class SQLContainer implements Container, Container.Filterable,
                             r.getReferencedColumn()));
             return true;
         } catch (Exception e) {
-            logger.log(Level.WARNING, "Setting referenced item failed.", e);
+            getLogger()
+                    .log(Level.WARNING, "Setting referenced item failed.", e);
             return false;
         }
     }
@@ -1640,4 +1644,8 @@ public class SQLContainer implements Container, Container.Filterable,
         }
     }
 
+    private static final Logger getLogger() {
+        return Logger.getLogger(SQLContainer.class.getName());
+    }
+
 }
\ No newline at end of file
diff --git a/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java b/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java
index 9e4bb772f5..40d0d0426f 100644
--- a/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java
+++ b/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java
@@ -13,8 +13,6 @@ import javax.naming.NamingException;
 import javax.sql.DataSource;
 
 public class J2EEConnectionPool implements JDBCConnectionPool {
-    private static final Logger logger = Logger
-            .getLogger(J2EEConnectionPool.class.getName());
 
     private String dataSourceJndiName;
 
@@ -58,7 +56,8 @@ public class J2EEConnectionPool implements JDBCConnectionPool {
             try {
                 conn.close();
             } catch (SQLException e) {
-                logger.log(Level.FINE, "Could not release SQL connection", e);
+                Logger.getLogger(J2EEConnectionPool.class.getName()).log(
+                        Level.FINE, "Could not release SQL connection", e);
             }
         }
     }
diff --git a/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java b/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
index 7e546309f6..22ca30cc32 100644
--- a/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
+++ b/src/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
@@ -38,9 +38,6 @@ import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;
 public class TableQuery implements QueryDelegate,
         QueryDelegate.RowIdChangeNotifier {
 
-    private static final Logger logger = Logger.getLogger(TableQuery.class
-            .getName());
-
     /** Table name, primary key column name(s) and version column name */
     private String tableName;
     private List<String> primaryKeyColumns;
@@ -115,7 +112,7 @@ public class TableQuery implements QueryDelegate,
      * @see com.vaadin.addon.sqlcontainer.query.QueryDelegate#getCount()
      */
     public int getCount() throws SQLException {
-        logger.log(Level.FINE, "Fetching count...");
+        getLogger().log(Level.FINE, "Fetching count...");
         StatementHelper sh = sqlGenerator.generateSelectQuery(tableName,
                 filters, null, 0, 0, "COUNT(*)");
         boolean shouldCloseTransaction = false;
@@ -228,7 +225,7 @@ public class TableQuery implements QueryDelegate,
         PreparedStatement pstmt = activeConnection.prepareStatement(
                 sh.getQueryString(), primaryKeyColumns.toArray(new String[0]));
         sh.setParameterValuesToStatement(pstmt);
-        logger.log(Level.FINE, "DB -> " + sh.getQueryString());
+        getLogger().log(Level.FINE, "DB -> " + sh.getQueryString());
         int result = pstmt.executeUpdate();
         if (result > 0) {
             /*
@@ -293,7 +290,7 @@ public class TableQuery implements QueryDelegate,
             throw new IllegalStateException();
         }
 
-        logger.log(Level.FINE, "DB -> begin transaction");
+        getLogger().log(Level.FINE, "DB -> begin transaction");
         activeConnection = connectionPool.reserveConnection();
         activeConnection.setAutoCommit(false);
         transactionOpen = true;
@@ -306,7 +303,7 @@ public class TableQuery implements QueryDelegate,
      */
     public void commit() throws UnsupportedOperationException, SQLException {
         if (transactionOpen && activeConnection != null) {
-            logger.log(Level.FINE, "DB -> commit");
+            getLogger().log(Level.FINE, "DB -> commit");
             activeConnection.commit();
             connectionPool.releaseConnection(activeConnection);
         } else {
@@ -334,7 +331,7 @@ public class TableQuery implements QueryDelegate,
      */
     public void rollback() throws UnsupportedOperationException, SQLException {
         if (transactionOpen && activeConnection != null) {
-            logger.log(Level.FINE, "DB -> rollback");
+            getLogger().log(Level.FINE, "DB -> rollback");
             activeConnection.rollback();
             connectionPool.releaseConnection(activeConnection);
         } else {
@@ -389,7 +386,7 @@ public class TableQuery implements QueryDelegate,
         }
         PreparedStatement pstmt = c.prepareStatement(sh.getQueryString());
         sh.setParameterValuesToStatement(pstmt);
-        logger.log(Level.FINE, "DB -> " + sh.getQueryString());
+        getLogger().log(Level.FINE, "DB -> " + sh.getQueryString());
         return pstmt.executeQuery();
     }
 
@@ -415,7 +412,7 @@ public class TableQuery implements QueryDelegate,
             }
             pstmt = c.prepareStatement(sh.getQueryString());
             sh.setParameterValuesToStatement(pstmt);
-            logger.log(Level.FINE, "DB -> " + sh.getQueryString());
+            getLogger().log(Level.FINE, "DB -> " + sh.getQueryString());
             int retval = pstmt.executeUpdate();
             return retval;
         } finally {
@@ -458,7 +455,7 @@ public class TableQuery implements QueryDelegate,
             pstmt = c.prepareStatement(sh.getQueryString(),
                     primaryKeyColumns.toArray(new String[0]));
             sh.setParameterValuesToStatement(pstmt);
-            logger.log(Level.FINE, "DB -> " + sh.getQueryString());
+            getLogger().log(Level.FINE, "DB -> " + sh.getQueryString());
             int result = pstmt.executeUpdate();
             genKeys = pstmt.getGeneratedKeys();
             RowId newId = getNewRowId(row, genKeys);
@@ -571,7 +568,7 @@ public class TableQuery implements QueryDelegate,
             }
             return new RowId(newRowId.toArray());
         } catch (Exception e) {
-            logger.log(Level.FINE,
+            getLogger().log(Level.FINE,
                     "Failed to fetch key values on insert: " + e.getMessage());
             return null;
         }
@@ -586,8 +583,8 @@ public class TableQuery implements QueryDelegate,
      */
     public boolean removeRow(RowItem row) throws UnsupportedOperationException,
             SQLException {
-        logger.log(Level.FINE, "Removing row with id: "
-                + row.getId().getId()[0].toString());
+        getLogger().log(Level.FINE,
+                "Removing row with id: " + row.getId().getId()[0].toString());
         if (executeUpdate(sqlGenerator.generateDeleteQuery(getTableName(),
                 primaryKeyColumns, versionColumn, row)) == 1) {
             return true;
@@ -695,4 +692,8 @@ public class TableQuery implements QueryDelegate,
             rowIdChangeListeners.remove(listener);
         }
     }
+
+    private static final Logger getLogger() {
+        return Logger.getLogger(TableQuery.class.getName());
+    }
 }
diff --git a/src/com/vaadin/event/ListenerMethod.java b/src/com/vaadin/event/ListenerMethod.java
index 1f1305fa69..f7dc8a7f13 100644
--- a/src/com/vaadin/event/ListenerMethod.java
+++ b/src/com/vaadin/event/ListenerMethod.java
@@ -43,9 +43,6 @@ import java.util.logging.Logger;
 @SuppressWarnings("serial")
 public class ListenerMethod implements EventListener, Serializable {
 
-    private static final Logger logger = Logger.getLogger(ListenerMethod.class
-            .getName());
-
     /**
      * Type of the event that should trigger this listener. Also the subclasses
      * of this class are accepted to trigger the listener.
@@ -84,9 +81,10 @@ public class ListenerMethod implements EventListener, Serializable {
             out.writeObject(name);
             out.writeObject(paramTypes);
         } catch (NotSerializableException e) {
-            logger.warning("Error in serialization of the application: Class "
-                    + target.getClass().getName()
-                    + " must implement serialization.");
+            getLogger().warning(
+                    "Error in serialization of the application: Class "
+                            + target.getClass().getName()
+                            + " must implement serialization.");
             throw e;
         }
 
@@ -103,7 +101,7 @@ public class ListenerMethod implements EventListener, Serializable {
             // inner classes
             method = findHighestMethod(target.getClass(), name, paramTypes);
         } catch (SecurityException e) {
-            logger.log(Level.SEVERE, "Internal deserialization error", e);
+            getLogger().log(Level.SEVERE, "Internal deserialization error", e);
         }
     };
 
@@ -658,4 +656,8 @@ public class ListenerMethod implements EventListener, Serializable {
         return target;
     }
 
+    private static final Logger getLogger() {
+        return Logger.getLogger(ListenerMethod.class.getName());
+    }
+
 }
diff --git a/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java b/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java
index 0d29e9a327..62bf64f76c 100644
--- a/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java
+++ b/src/com/vaadin/event/dd/acceptcriteria/SourceIs.java
@@ -25,8 +25,6 @@ import com.vaadin.ui.Component;
 @SuppressWarnings("serial")
 @ClientCriterion(VDragSourceIs.class)
 public class SourceIs extends ClientSideCriterion {
-    private static final Logger logger = Logger.getLogger(SourceIs.class
-            .getName());
 
     private Component[] components;
 
@@ -43,11 +41,11 @@ public class SourceIs extends ClientSideCriterion {
             if (c.getApplication() != null) {
                 target.addAttribute("component" + paintedComponents++, c);
             } else {
-                logger.log(
-                        Level.WARNING,
-                        "SourceIs component {0} at index {1} is not attached to the component hierachy and will thus be ignored",
-                        new Object[] { c.getClass().getName(),
-                                Integer.valueOf(i) });
+                Logger.getLogger(SourceIs.class.getName())
+                        .log(Level.WARNING,
+                                "SourceIs component {0} at index {1} is not attached to the component hierachy and will thus be ignored",
+                                new Object[] { c.getClass().getName(),
+                                        Integer.valueOf(i) });
             }
         }
         target.addAttribute("c", paintedComponents);
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
index 0a8e9530f0..9f1bd4e9ee 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
@@ -68,9 +68,6 @@ import com.vaadin.ui.Window;
 public abstract class AbstractApplicationPortlet extends GenericPortlet
         implements Constants {
 
-    private static final Logger logger = Logger
-            .getLogger(AbstractApplicationPortlet.class.getName());
-
     /**
      * This portlet parameter is used to add styles to the main element. E.g
      * "height:500px" generates a style="height:500px" to the main element.
@@ -123,7 +120,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
              * Print an information/warning message about running with xsrf
              * protection disabled
              */
-            logger.warning(WARNING_XSRF_PROTECTION_DISABLED);
+            getLogger().warning(WARNING_XSRF_PROTECTION_DISABLED);
         }
     }
 
@@ -136,9 +133,10 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
     private void checkWidgetsetVersion(PortletRequest request) {
         if (!AbstractApplicationServlet.VERSION.equals(getHTTPRequestParameter(
                 request, "wsver"))) {
-            logger.warning(String.format(WIDGETSET_MISMATCH_INFO,
-                    AbstractApplicationServlet.VERSION,
-                    getHTTPRequestParameter(request, "wsver")));
+            getLogger().warning(
+                    String.format(WIDGETSET_MISMATCH_INFO,
+                            AbstractApplicationServlet.VERSION,
+                            getHTTPRequestParameter(request, "wsver")));
         }
     }
 
@@ -158,7 +156,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
         if (!productionMode) {
             /* Print an information/warning message about running in debug mode */
             // TODO Maybe we need a different message for portlets?
-            logger.warning(NOT_PRODUCTION_MODE_INFO);
+            getLogger().warning(NOT_PRODUCTION_MODE_INFO);
         }
     }
 
@@ -473,11 +471,12 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
             } catch (final SessionExpiredException e) {
                 // TODO Figure out a better way to deal with
                 // SessionExpiredExceptions
-                logger.finest("A user session has expired");
+                getLogger().finest("A user session has expired");
             } catch (final GeneralSecurityException e) {
                 // TODO Figure out a better way to deal with
                 // GeneralSecurityExceptions
-                logger.fine("General security exception, the security key was probably incorrect.");
+                getLogger()
+                        .fine("General security exception, the security key was probably incorrect.");
             } catch (final Throwable e) {
                 handleServiceException(request, response, application, e);
             } finally {
@@ -508,7 +507,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
 
     private void handleUnknownRequest(PortletRequest request,
             PortletResponse response) {
-        logger.warning("Unknown request type");
+        getLogger().warning("Unknown request type");
     }
 
     /**
@@ -705,8 +704,9 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
                 os.write(buffer, 0, bytes);
             }
         } else {
-            logger.info("Requested resource [" + resourceID
-                    + "] could not be found");
+            getLogger().info(
+                    "Requested resource [" + resourceID
+                            + "] could not be found");
             response.setProperty(ResourceResponse.HTTP_STATUS_CODE,
                     Integer.toString(HttpServletResponse.SC_NOT_FOUND));
         }
@@ -963,7 +963,8 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
             appClass += getApplicationClass().getSimpleName();
         } catch (ClassNotFoundException e) {
             appClass += "unknown";
-            logger.log(Level.SEVERE, "Could not find application class", e);
+            getLogger()
+                    .log(Level.SEVERE, "Could not find application class", e);
         }
         String themeClass = "v-theme-"
                 + themeName.replaceAll("[^a-zA-Z0-9]", "");
@@ -1633,4 +1634,8 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
         return PortletApplicationContext2.getApplicationContext(portletSession);
     }
 
+    private static final Logger getLogger() {
+        return Logger.getLogger(AbstractApplicationPortlet.class.getName());
+    }
+
 }
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index 54ea4a94ed..c6d286ed03 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -67,9 +67,6 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
     // TODO Move some (all?) of the constants to a separate interface (shared
     // with portlet)
 
-    private static final Logger logger = Logger
-            .getLogger(AbstractApplicationServlet.class.getName());
-
     /**
      * The version number of this release. For example "6.2.0". Always in the
      * format "major.minor.revision[.build]". The build part is optional. All of
@@ -232,7 +229,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
              * Print an information/warning message about running with xsrf
              * protection disabled
              */
-            logger.warning(WARNING_XSRF_PROTECTION_DISABLED);
+            getLogger().warning(WARNING_XSRF_PROTECTION_DISABLED);
         }
     }
 
@@ -244,8 +241,9 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
      */
     private void checkWidgetsetVersion(HttpServletRequest request) {
         if (!VERSION.equals(request.getParameter("wsver"))) {
-            logger.warning(String.format(WIDGETSET_MISMATCH_INFO, VERSION,
-                    request.getParameter("wsver")));
+            getLogger().warning(
+                    String.format(WIDGETSET_MISMATCH_INFO, VERSION,
+                            request.getParameter("wsver")));
         }
     }
 
@@ -264,7 +262,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
 
         if (!productionMode) {
             /* Print an information/warning message about running in debug mode */
-            logger.warning(NOT_PRODUCTION_MODE_INFO);
+            getLogger().warning(NOT_PRODUCTION_MODE_INFO);
         }
 
     }
@@ -278,7 +276,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
         } catch (NumberFormatException nfe) {
             // Default is 1h
             resourceCacheTime = 3600;
-            logger.warning(WARNING_RESOURCE_CACHING_TIME_NOT_NUMERIC);
+            getLogger().warning(WARNING_RESOURCE_CACHING_TIME_NOT_NUMERIC);
         }
     }
 
@@ -857,8 +855,8 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
                 resultPath = url.getFile();
             } catch (final Exception e) {
                 // FIXME: Handle exception
-                logger.log(Level.INFO, "Could not find resource path " + path,
-                        e);
+                getLogger().log(Level.INFO,
+                        "Could not find resource path " + path, e);
             }
         }
         return resultPath;
@@ -1273,10 +1271,11 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
 
             if (resourceUrl == null) {
                 // cannot serve requested file
-                logger.info("Requested resource ["
-                        + filename
-                        + "] not found from filesystem or through class loader."
-                        + " Add widgetset and/or theme JAR to your classpath or add files to WebContent/VAADIN folder.");
+                getLogger()
+                        .info("Requested resource ["
+                                + filename
+                                + "] not found from filesystem or through class loader."
+                                + " Add widgetset and/or theme JAR to your classpath or add files to WebContent/VAADIN folder.");
                 response.setStatus(HttpServletResponse.SC_NOT_FOUND);
                 return;
             }
@@ -1284,9 +1283,10 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
             // security check: do not permit navigation out of the VAADIN
             // directory
             if (!isAllowedVAADINResourceUrl(request, resourceUrl)) {
-                logger.info("Requested resource ["
-                        + filename
-                        + "] not accessible in the VAADIN directory or access to it is forbidden.");
+                getLogger()
+                        .info("Requested resource ["
+                                + filename
+                                + "] not accessible in the VAADIN directory or access to it is forbidden.");
                 response.setStatus(HttpServletResponse.SC_FORBIDDEN);
                 return;
             }
@@ -1307,10 +1307,10 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
             }
         } catch (Exception e) {
             // Failed to find out last modified timestamp. Continue without it.
-            logger.log(
-                    Level.FINEST,
-                    "Failed to find out last modified timestamp. Continuing without it.",
-                    e);
+            getLogger()
+                    .log(Level.FINEST,
+                            "Failed to find out last modified timestamp. Continuing without it.",
+                            e);
         }
 
         // Set type mime type if we can determine it based on the filename
@@ -1375,12 +1375,14 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
             // loader sees it.
 
             if (!resourceUrl.getPath().contains("!/VAADIN/")) {
-                logger.info("Blocked attempt to access a JAR entry not starting with /VAADIN/: "
-                        + resourceUrl);
+                getLogger().info(
+                        "Blocked attempt to access a JAR entry not starting with /VAADIN/: "
+                                + resourceUrl);
                 return false;
             }
-            logger.fine("Accepted access to a JAR entry using a class loader: "
-                    + resourceUrl);
+            getLogger().fine(
+                    "Accepted access to a JAR entry using a class loader: "
+                            + resourceUrl);
             return true;
         } else {
             // Some servers such as GlassFish extract files from JARs (file:)
@@ -1390,11 +1392,13 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
             // "/../"
             if (!resourceUrl.getPath().contains("/VAADIN/")
                     || resourceUrl.getPath().contains("/../")) {
-                logger.info("Blocked attempt to access file: " + resourceUrl);
+                getLogger().info(
+                        "Blocked attempt to access file: " + resourceUrl);
                 return false;
             }
-            logger.fine("Accepted access to a file using a class loader: "
-                    + resourceUrl);
+            getLogger().fine(
+                    "Accepted access to a file using a class loader: "
+                            + resourceUrl);
             return true;
         }
     }
@@ -1796,7 +1800,8 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
         try {
             return getApplicationClass().getSimpleName();
         } catch (ClassNotFoundException e) {
-            logger.log(Level.WARNING, "getApplicationCSSClassName failed", e);
+            getLogger().log(Level.WARNING, "getApplicationCSSClassName failed",
+                    e);
             return "unknown";
         }
     }
@@ -2518,4 +2523,8 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
                 c > 96 && c < 123 // a-z
         ;
     }
+
+    private static final Logger getLogger() {
+        return Logger.getLogger(AbstractApplicationServlet.class.getName());
+    }
 }
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
index cb570f88e7..b001b52918 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
@@ -91,9 +91,6 @@ public abstract class AbstractCommunicationManager implements
 
     private static final String DASHDASH = "--";
 
-    private static final Logger logger = Logger
-            .getLogger(AbstractCommunicationManager.class.getName());
-
     /**
      * Generic interface of a (HTTP or Portlet) request to the application.
      * 
@@ -737,8 +734,9 @@ public abstract class AbstractCommunicationManager implements
                 if (window == null) {
                     // This should not happen, no windows exists but
                     // application is still open.
-                    logger.warning("Could not get window for application with request ID "
-                            + request.getRequestID());
+                    getLogger().warning(
+                            "Could not get window for application with request ID "
+                                    + request.getRequestID());
                     return;
                 }
             } else {
@@ -762,7 +760,7 @@ public abstract class AbstractCommunicationManager implements
                     // FIXME: Handle exception
                     // Not critical, but something is still wrong; print
                     // stacktrace
-                    logger.log(Level.WARNING,
+                    getLogger().log(Level.WARNING,
                             "getSystemMessages() failed - continuing", e2);
                 }
                 if (ci != null) {
@@ -808,7 +806,7 @@ public abstract class AbstractCommunicationManager implements
 
             printHighlightedComponentHierarchy(sb, component);
         }
-        logger.info(sb.toString());
+        getLogger().info(sb.toString());
     }
 
     protected void printHighlightedComponentHierarchy(StringBuilder sb,
@@ -1095,16 +1093,16 @@ public abstract class AbstractCommunicationManager implements
                     (Class[]) null);
             ci = (Application.SystemMessages) m.invoke(null, (Object[]) null);
         } catch (NoSuchMethodException e) {
-            logger.log(Level.WARNING,
+            getLogger().log(Level.WARNING,
                     "getSystemMessages() failed - continuing", e);
         } catch (IllegalArgumentException e) {
-            logger.log(Level.WARNING,
+            getLogger().log(Level.WARNING,
                     "getSystemMessages() failed - continuing", e);
         } catch (IllegalAccessException e) {
-            logger.log(Level.WARNING,
+            getLogger().log(Level.WARNING,
                     "getSystemMessages() failed - continuing", e);
         } catch (InvocationTargetException e) {
-            logger.log(Level.WARNING,
+            getLogger().log(Level.WARNING,
                     "getSystemMessages() failed - continuing", e);
         }
 
@@ -1144,8 +1142,8 @@ public abstract class AbstractCommunicationManager implements
                         resource);
             } catch (final Exception e) {
                 // FIXME: Handle exception
-                logger.log(Level.FINER, "Failed to get theme resource stream.",
-                        e);
+                getLogger().log(Level.FINER,
+                        "Failed to get theme resource stream.", e);
             }
             if (is != null) {
 
@@ -1164,13 +1162,13 @@ public abstract class AbstractCommunicationManager implements
                     r.close();
                 } catch (final java.io.IOException e) {
                     // FIXME: Handle exception
-                    logger.log(Level.INFO, "Resource transfer failed", e);
+                    getLogger().log(Level.INFO, "Resource transfer failed", e);
                 }
                 outWriter.print("\""
                         + JsonPaintTarget.escapeJSON(layout.toString()) + "\"");
             } else {
                 // FIXME: Handle exception
-                logger.severe("CustomLayout not found: " + resource);
+                getLogger().severe("CustomLayout not found: " + resource);
             }
         }
         outWriter.print("}");
@@ -1444,7 +1442,7 @@ public abstract class AbstractCommunicationManager implements
                             + variable[VAR_PID];
                     success = false;
                 }
-                logger.warning(msg);
+                getLogger().warning(msg);
                 continue;
             }
         }
@@ -1779,8 +1777,9 @@ public abstract class AbstractCommunicationManager implements
             DateFormat dateFormat = DateFormat.getDateTimeInstance(
                     DateFormat.SHORT, DateFormat.SHORT, l);
             if (!(dateFormat instanceof SimpleDateFormat)) {
-                logger.warning("Unable to get default date pattern for locale "
-                        + l.toString());
+                getLogger().warning(
+                        "Unable to get default date pattern for locale "
+                                + l.toString());
                 dateFormat = new SimpleDateFormat();
             }
             final String df = ((SimpleDateFormat) dateFormat).toPattern();
@@ -2483,4 +2482,8 @@ public abstract class AbstractCommunicationManager implements
             return b;
         }
     }
+
+    private static final Logger getLogger() {
+        return Logger.getLogger(AbstractCommunicationManager.class.getName());
+    }
 }
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java b/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java
index c0ae0afc26..bf4ea860a8 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java
@@ -32,9 +32,6 @@ import com.vaadin.terminal.ApplicationResource;
 public abstract class AbstractWebApplicationContext implements
         ApplicationContext, HttpSessionBindingListener, Serializable {
 
-    private static final Logger logger = Logger
-            .getLogger(AbstractWebApplicationContext.class.getName());
-
     protected Collection<TransactionListener> listeners = Collections
             .synchronizedList(new LinkedList<TransactionListener>());
 
@@ -145,7 +142,7 @@ public abstract class AbstractWebApplicationContext implements
             // remove same application here. Possible if you got e.g. session
             // lifetime 1 min but socket write may take longer than 1 min.
             // FIXME: Handle exception
-            logger.log(Level.SEVERE,
+            getLogger().log(Level.SEVERE,
                     "Could not remove application, leaking memory.", e);
         }
     }
@@ -252,4 +249,8 @@ public abstract class AbstractWebApplicationContext implements
         return lastRequestTime;
     }
 
+    private Logger getLogger() {
+        return Logger.getLogger(AbstractWebApplicationContext.class.getName());
+    }
+
 }
\ No newline at end of file
diff --git a/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java b/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java
index a9eaa1bb82..38b36a0cbf 100644
--- a/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java
@@ -19,9 +19,6 @@ import com.vaadin.Application;
 @SuppressWarnings("serial")
 public class ApplicationRunnerServlet extends AbstractApplicationServlet {
 
-    private static final Logger logger = Logger
-            .getLogger(ApplicationRunnerServlet.class.getName());
-
     /**
      * The name of the application class currently used. Only valid within one
      * request.
@@ -176,10 +173,10 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet {
                         // Ignore as this is expected for many packages
                     } catch (Exception e2) {
                         // TODO: handle exception
-                        logger.log(
-                                Level.FINE,
-                                "Failed to find application class in the default package.",
-                                e2);
+                        getLogger()
+                                .log(Level.FINE,
+                                        "Failed to find application class in the default package.",
+                                        e2);
                     }
                     if (appClass != null) {
                         return appClass;
@@ -215,4 +212,8 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet {
         return staticFilesPath;
     }
 
+    private Logger getLogger() {
+        return Logger.getLogger(ApplicationRunnerServlet.class.getName());
+    }
+
 }
diff --git a/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java b/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java
index 7889968e63..2c48d03b10 100644
--- a/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java
+++ b/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java
@@ -35,9 +35,6 @@ import com.vaadin.ui.Window;
 @SuppressWarnings({ "serial", "deprecation" })
 public class ComponentSizeValidator implements Serializable {
 
-    private final static Logger logger = Logger
-            .getLogger(ComponentSizeValidator.class.getName());
-
     private final static int LAYERS_SHOWN = 4;
 
     /**
@@ -135,7 +132,7 @@ public class ComponentSizeValidator implements Serializable {
 
             return parentCanDefineHeight(component);
         } catch (Exception e) {
-            logger.log(Level.FINER,
+            getLogger().log(Level.FINER,
                     "An exception occurred while validating sizes.", e);
             return true;
         }
@@ -155,7 +152,7 @@ public class ComponentSizeValidator implements Serializable {
 
             return parentCanDefineWidth(component);
         } catch (Exception e) {
-            logger.log(Level.FINER,
+            getLogger().log(Level.FINER,
                     "An exception occurred while validating sizes.", e);
             return true;
         }
@@ -675,11 +672,15 @@ public class ComponentSizeValidator implements Serializable {
                 return;
             } catch (Exception e) {
                 // TODO Auto-generated catch block
-                logger.log(Level.FINER,
+                getLogger().log(Level.FINER,
                         "An exception occurred while validating sizes.", e);
             }
 
         }
     }
 
+    private static Logger getLogger() {
+        return Logger.getLogger(ComponentSizeValidator.class.getName());
+    }
+
 }
diff --git a/src/com/vaadin/terminal/gwt/server/DragAndDropService.java b/src/com/vaadin/terminal/gwt/server/DragAndDropService.java
index 3a923c1840..0653754c39 100644
--- a/src/com/vaadin/terminal/gwt/server/DragAndDropService.java
+++ b/src/com/vaadin/terminal/gwt/server/DragAndDropService.java
@@ -23,9 +23,6 @@ import com.vaadin.ui.Component;
 
 public class DragAndDropService implements VariableOwner {
 
-    private static final Logger logger = Logger
-            .getLogger(DragAndDropService.class.getName());
-
     private int lastVisitId;
 
     private boolean lastVisitAccepted = false;
@@ -45,8 +42,9 @@ public class DragAndDropService implements VariableOwner {
 
         // Validate drop handler owner
         if (!(owner instanceof DropTarget)) {
-            logger.severe("DropHandler owner " + owner
-                    + " must implement DropTarget");
+            getLogger()
+                    .severe("DropHandler owner " + owner
+                            + " must implement DropTarget");
             return;
         }
         // owner cannot be null here
@@ -76,8 +74,9 @@ public class DragAndDropService implements VariableOwner {
         DropHandler dropHandler = (dropTarget).getDropHandler();
         if (dropHandler == null) {
             // No dropHandler returned so no drop can be performed.
-            logger.fine("DropTarget.getDropHandler() returned null for owner: "
-                    + dropTarget);
+            getLogger().fine(
+                    "DropTarget.getDropHandler() returned null for owner: "
+                            + dropTarget);
             return;
         }
 
@@ -212,4 +211,8 @@ public class DragAndDropService implements VariableOwner {
         }
         return false;
     }
+
+    private Logger getLogger() {
+        return Logger.getLogger(DragAndDropService.class.getName());
+    }
 }
diff --git a/src/com/vaadin/terminal/gwt/server/GAEApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/GAEApplicationServlet.java
index 485c98f036..a6032fa98d 100644
--- a/src/com/vaadin/terminal/gwt/server/GAEApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/GAEApplicationServlet.java
@@ -94,9 +94,6 @@ import com.vaadin.service.ApplicationContext;
  */
 public class GAEApplicationServlet extends ApplicationServlet {
 
-    private static final Logger logger = Logger
-            .getLogger(GAEApplicationServlet.class.getName());
-
     // memcache mutex is MUTEX_BASE + sessio id
     private static final String MUTEX_BASE = "_vmutex";
 
@@ -209,8 +206,9 @@ public class GAEApplicationServlet extends ApplicationServlet {
                 try {
                     Thread.sleep(RETRY_AFTER_MILLISECONDS);
                 } catch (InterruptedException e) {
-                    logger.finer("Thread.sleep() interrupted while waiting for lock. Trying again. "
-                            + e);
+                    getLogger().finer(
+                            "Thread.sleep() interrupted while waiting for lock. Trying again. "
+                                    + e);
                 }
             }
 
@@ -252,16 +250,16 @@ public class GAEApplicationServlet extends ApplicationServlet {
             ds.put(entity);
 
         } catch (DeadlineExceededException e) {
-            logger.warning("DeadlineExceeded for " + session.getId());
+            getLogger().warning("DeadlineExceeded for " + session.getId());
             sendDeadlineExceededNotification(request, response);
         } catch (NotSerializableException e) {
-            logger.log(Level.SEVERE, "Not serializable!", e);
+            getLogger().log(Level.SEVERE, "Not serializable!", e);
 
             // TODO this notification is usually not shown - should we redirect
             // in some other way - can we?
             sendNotSerializableNotification(request, response);
         } catch (Exception e) {
-            logger.log(Level.WARNING,
+            getLogger().log(Level.WARNING,
                     "An exception occurred while servicing request.", e);
 
             sendCriticalErrorNotification(request, response);
@@ -308,12 +306,14 @@ public class GAEApplicationServlet extends ApplicationServlet {
                 session.setAttribute(WebApplicationContext.class.getName(),
                         applicationContext);
             } catch (IOException e) {
-                logger.log(Level.WARNING,
+                getLogger().log(
+                        Level.WARNING,
                         "Could not de-serialize ApplicationContext for "
                                 + session.getId()
                                 + " A new one will be created. ", e);
             } catch (ClassNotFoundException e) {
-                logger.log(Level.WARNING,
+                getLogger().log(
+                        Level.WARNING,
                         "Could not de-serialize ApplicationContext for "
                                 + session.getId()
                                 + " A new one will be created. ", e);
@@ -368,8 +368,9 @@ public class GAEApplicationServlet extends ApplicationServlet {
                 List<Entity> entities = pq.asList(Builder
                         .withLimit(CLEANUP_LIMIT));
                 if (entities != null) {
-                    logger.info("Vaadin cleanup deleting " + entities.size()
-                            + " expired Vaadin sessions.");
+                    getLogger().info(
+                            "Vaadin cleanup deleting " + entities.size()
+                                    + " expired Vaadin sessions.");
                     List<Key> keys = new ArrayList<Key>();
                     for (Entity e : entities) {
                         keys.add(e.getKey());
@@ -387,8 +388,9 @@ public class GAEApplicationServlet extends ApplicationServlet {
                 List<Entity> entities = pq.asList(Builder
                         .withLimit(CLEANUP_LIMIT));
                 if (entities != null) {
-                    logger.info("Vaadin cleanup deleting " + entities.size()
-                            + " expired appengine sessions.");
+                    getLogger().info(
+                            "Vaadin cleanup deleting " + entities.size()
+                                    + " expired appengine sessions.");
                     List<Key> keys = new ArrayList<Key>();
                     for (Entity e : entities) {
                         keys.add(e.getKey());
@@ -397,7 +399,11 @@ public class GAEApplicationServlet extends ApplicationServlet {
                 }
             }
         } catch (Exception e) {
-            logger.log(Level.WARNING, "Exception while cleaning.", e);
+            getLogger().log(Level.WARNING, "Exception while cleaning.", e);
         }
     }
+
+    private static final Logger getLogger() {
+        return Logger.getLogger(GAEApplicationServlet.class.getName());
+    }
 }
diff --git a/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java b/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
index 97c5139296..9292ae2506 100644
--- a/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
+++ b/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
@@ -52,9 +52,6 @@ import com.vaadin.ui.CustomLayout;
 @SuppressWarnings("serial")
 public class JsonPaintTarget implements PaintTarget {
 
-    private static final Logger logger = Logger.getLogger(JsonPaintTarget.class
-            .getName());
-
     /* Document type declarations */
 
     private final static String UIDL_ARG_NAME = "name";
@@ -700,11 +697,11 @@ public class JsonPaintTarget implements PaintTarget {
         if (!manager.hasPaintableId(paintable)) {
             if (paintable instanceof Component
                     && ((Component) paintable).getApplication() == null) {
-                logger.log(
-                        Level.WARNING,
-                        "Painting reference to orphan "
-                                + paintable.getClass().getName()
-                                + ", the component will not be accessible on the client side.");
+                getLogger()
+                        .log(Level.WARNING,
+                                "Painting reference to orphan "
+                                        + paintable.getClass().getName()
+                                        + ", the component will not be accessible on the client side.");
                 return "Orphan";
             }
             if (identifiersCreatedDueRefPaint == null) {
@@ -1029,10 +1026,12 @@ public class JsonPaintTarget implements PaintTarget {
                         && Paintable.class.isAssignableFrom(superclass)) {
                     class1 = (Class<? extends Paintable>) superclass;
                 } else {
-                    logger.warning("No superclass of "
-                            + paintable.getClass().getName()
-                            + " has a @ClientWidget"
-                            + " annotation. Component will not be mapped correctly on client side.");
+                    getLogger()
+                            .warning(
+                                    "No superclass of "
+                                            + paintable.getClass().getName()
+                                            + " has a @ClientWidget"
+                                            + " annotation. Component will not be mapped correctly on client side.");
                     break;
                 }
             }
@@ -1136,18 +1135,19 @@ public class JsonPaintTarget implements PaintTarget {
                     // TODO could optimize to quit at the end attribute
                 }
             } catch (IOException e1) {
-                logger.log(Level.SEVERE,
+                getLogger().log(Level.SEVERE,
                         "An error occurred while finding widget mapping.", e1);
             } finally {
                 try {
                     bufferedReader.close();
                 } catch (IOException e1) {
-                    logger.log(Level.SEVERE, "Could not close reader.", e1);
+                    getLogger()
+                            .log(Level.SEVERE, "Could not close reader.", e1);
 
                 }
             }
         } catch (Throwable t) {
-            logger.log(Level.SEVERE,
+            getLogger().log(Level.SEVERE,
                     "An error occurred while finding widget mapping.", t);
         }
 
@@ -1176,4 +1176,8 @@ public class JsonPaintTarget implements PaintTarget {
         return !cacheEnabled;
     }
 
+    private static final Logger getLogger() {
+        return Logger.getLogger(JsonPaintTarget.class.getName());
+    }
+
 }
diff --git a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java
index dce1a1a78c..1875103652 100644
--- a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java
+++ b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java
@@ -49,9 +49,6 @@ import com.vaadin.ui.Window;
 @SuppressWarnings("serial")
 public class PortletApplicationContext2 extends AbstractWebApplicationContext {
 
-    private static final Logger logger = Logger
-            .getLogger(PortletApplicationContext2.class.getName());
-
     protected Map<Application, Set<PortletListener>> portletListeners = new HashMap<Application, Set<PortletListener>>();
 
     protected transient PortletSession session;
@@ -77,11 +74,11 @@ public class PortletApplicationContext2 extends AbstractWebApplicationContext {
                 return new File(url.getFile());
             } catch (final Exception e) {
                 // FIXME: Handle exception
-                logger.log(
-                        Level.INFO,
-                        "Cannot access base directory, possible security issue "
-                                + "with Application Server or Servlet Container",
-                        e);
+                getLogger()
+                        .log(Level.INFO,
+                                "Cannot access base directory, possible security issue "
+                                        + "with Application Server or Servlet Container",
+                                e);
             }
         }
         return null;
@@ -415,4 +412,8 @@ public class PortletApplicationContext2 extends AbstractWebApplicationContext {
                     "Portlet mode can only be changed from a portlet request");
         }
     }
+
+    private Logger getLogger() {
+        return Logger.getLogger(PortletApplicationContext2.class.getName());
+    }
 }
diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java b/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java
index 2e4ce39513..8d7e370aaa 100644
--- a/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java
+++ b/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java
@@ -54,9 +54,6 @@ import com.vaadin.ui.ClientWidget;
  */
 public class ClassPathExplorer {
 
-    private static Logger logger = Logger.getLogger(ClassPathExplorer.class
-            .getName());
-
     private static final String VAADIN_ADDON_VERSION_ATTRIBUTE = "Vaadin-Package-Version";
 
     /**
@@ -103,6 +100,7 @@ public class ClassPathExplorer {
      * @return a collection of {@link Paintable} classes
      */
     public static Collection<Class<? extends Paintable>> getPaintablesHavingWidgetAnnotation() {
+        final Logger logger = getLogger();
         logger.info("Searching for paintables..");
         long start = System.currentTimeMillis();
         Collection<Class<? extends Paintable>> paintables = new HashSet<Class<? extends Paintable>>();
@@ -157,6 +155,7 @@ public class ClassPathExplorer {
             sb.append(widgetsets.get(ws));
             sb.append("\n");
         }
+        final Logger logger = getLogger();
         logger.info(sb.toString());
         logger.info("Search took " + (end - start) + "ms");
         return widgetsets;
@@ -217,7 +216,7 @@ public class ClassPathExplorer {
                     } catch (MalformedURLException e) {
                         // should never happen as based on an existing URL,
                         // only changing end of file name/path part
-                        logger.log(Level.SEVERE,
+                        getLogger().log(Level.SEVERE,
                                 "Error locating the widgetset " + classname, e);
                     }
                 }
@@ -253,7 +252,7 @@ public class ClassPathExplorer {
                     }
                 }
             } catch (IOException e) {
-                logger.log(Level.WARNING, "Error parsing jar file", e);
+                getLogger().log(Level.WARNING, "Error parsing jar file", e);
             }
 
         }
@@ -281,7 +280,7 @@ public class ClassPathExplorer {
             classpath = classpath.substring(0, classpath.length() - 1);
         }
 
-        logger.fine("Classpath: " + classpath);
+        getLogger().fine("Classpath: " + classpath);
 
         String[] split = classpath.split(pathSep);
         for (int i = 0; i < split.length; i++) {
@@ -315,6 +314,7 @@ public class ClassPathExplorer {
             include(null, file, locations);
         }
         long end = System.currentTimeMillis();
+        Logger logger = getLogger();
         if (logger.isLoggable(Level.FINE)) {
             logger.fine("getClassPathLocations took " + (end - start) + "ms");
         }
@@ -355,7 +355,7 @@ public class ClassPathExplorer {
                     url = new URL("jar:" + url.toExternalForm() + "!/");
                     JarURLConnection conn = (JarURLConnection) url
                             .openConnection();
-                    logger.fine(url.toString());
+                    getLogger().fine(url.toString());
                     JarFile jarFile = conn.getJarFile();
                     Manifest manifest = jarFile.getManifest();
                     if (manifest != null) {
@@ -366,9 +366,11 @@ public class ClassPathExplorer {
                         }
                     }
                 } catch (MalformedURLException e) {
-                    logger.log(Level.FINEST, "Failed to inspect JAR file", e);
+                    getLogger().log(Level.FINEST, "Failed to inspect JAR file",
+                            e);
                 } catch (IOException e) {
-                    logger.log(Level.FINEST, "Failed to inspect JAR file", e);
+                    getLogger().log(Level.FINEST, "Failed to inspect JAR file",
+                            e);
                 }
 
                 return false;
@@ -515,7 +517,7 @@ public class ClassPathExplorer {
                     }
                 }
             } catch (IOException e) {
-                logger.warning(e.toString());
+                getLogger().warning(e.toString());
             }
         }
 
@@ -594,7 +596,8 @@ public class ClassPathExplorer {
 
         // Must be done here after stderr and stdout have been reset.
         if (errorToShow != null && logLevel != null) {
-            logger.log(logLevel,
+            getLogger().log(
+                    logLevel,
                     "Failed to load class " + fullclassName + ". "
                             + errorToShow.getClass().getName() + ": "
                             + errorToShow.getMessage());
@@ -613,6 +616,9 @@ public class ClassPathExplorer {
      * @return URL
      */
     public static URL getDefaultSourceDirectory() {
+
+        final Logger logger = getLogger();
+
         if (logger.isLoggable(Level.FINE)) {
             logger.fine("classpathLocations values:");
             ArrayList<String> locations = new ArrayList<String>(
@@ -669,20 +675,24 @@ public class ClassPathExplorer {
     public static void main(String[] args) {
         Collection<Class<? extends Paintable>> paintables = ClassPathExplorer
                 .getPaintablesHavingWidgetAnnotation();
-        logger.info("Found annotated paintables:");
+        getLogger().info("Found annotated paintables:");
         for (Class<? extends Paintable> cls : paintables) {
-            logger.info(cls.getCanonicalName());
+            getLogger().info(cls.getCanonicalName());
         }
 
-        logger.info("");
-        logger.info("Searching available widgetsets...");
+        getLogger().info("");
+        getLogger().info("Searching available widgetsets...");
 
         Map<String, URL> availableWidgetSets = ClassPathExplorer
                 .getAvailableWidgetSets();
         for (String string : availableWidgetSets.keySet()) {
 
-            logger.info(string + " in " + availableWidgetSets.get(string));
+            getLogger().info(string + " in " + availableWidgetSets.get(string));
         }
     }
 
+    private static final Logger getLogger() {
+        return Logger.getLogger(ClassPathExplorer.class.getName());
+    }
+
 }
diff --git a/src/com/vaadin/tools/WidgetsetCompiler.java b/src/com/vaadin/tools/WidgetsetCompiler.java
index 323fb17e32..9bb76022ae 100644
--- a/src/com/vaadin/tools/WidgetsetCompiler.java
+++ b/src/com/vaadin/tools/WidgetsetCompiler.java
@@ -33,9 +33,6 @@ import com.vaadin.terminal.gwt.widgetsetutils.WidgetSetBuilder;
  */
 public class WidgetsetCompiler {
 
-    private static final Logger logger = Logger
-            .getLogger(WidgetsetCompiler.class.getName());
-
     /**
      * @param args
      *            same arguments as for com.google.gwt.dev.Compiler
@@ -72,7 +69,7 @@ public class WidgetsetCompiler {
                                 String[].class);
                         method.invoke(null, new Object[] { args });
                     } catch (Throwable thr) {
-                        logger.log(Level.SEVERE,
+                        getLogger().log(Level.SEVERE,
                                 "Widgetset compilation failed", thr);
                     }
                 }
@@ -82,7 +79,11 @@ public class WidgetsetCompiler {
             runThread.join();
             System.out.println("Widgetset compilation finished");
         } catch (Throwable thr) {
-            logger.log(Level.SEVERE, "Widgetset compilation failed", thr);
+            getLogger().log(Level.SEVERE, "Widgetset compilation failed", thr);
         }
     }
+
+    private static final Logger getLogger() {
+        return Logger.getLogger(WidgetsetCompiler.class.getName());
+    }
 }
diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index 73fe9679d5..55f3f27507 100644
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -76,8 +76,7 @@ public class Table extends AbstractSelect implements Action.Container,
         Container.Ordered, Container.Sortable, ItemClickSource,
         ItemClickNotifier, DragSource, DropTarget {
 
-    private static final Logger logger = Logger
-            .getLogger(Table.class.getName());
+    private transient Logger logger = null;
 
     /**
      * Modes that Table support as drag sourse.
@@ -1646,8 +1645,9 @@ public class Table extends AbstractSelect implements Action.Container,
      * @return
      */
     private Object[][] getVisibleCellsInsertIntoCache(int firstIndex, int rows) {
-        logger.finest("Insert " + rows + " rows at index " + firstIndex
-                + " to existing page buffer requested");
+        getLogger().finest(
+                "Insert " + rows + " rows at index " + firstIndex
+                        + " to existing page buffer requested");
 
         // Page buffer must not become larger than pageLength*cacheRate before
         // or after the current page
@@ -1750,11 +1750,14 @@ public class Table extends AbstractSelect implements Action.Container,
             }
         }
         pageBuffer = newPageBuffer;
-        logger.finest("Page Buffer now contains "
-                + pageBuffer[CELL_ITEMID].length + " rows ("
-                + pageBufferFirstIndex + "-"
-                + (pageBufferFirstIndex + pageBuffer[CELL_ITEMID].length - 1)
-                + ")");
+        getLogger().finest(
+                "Page Buffer now contains "
+                        + pageBuffer[CELL_ITEMID].length
+                        + " rows ("
+                        + pageBufferFirstIndex
+                        + "-"
+                        + (pageBufferFirstIndex
+                                + pageBuffer[CELL_ITEMID].length - 1) + ")");
         return cells;
     }
 
@@ -1771,8 +1774,9 @@ public class Table extends AbstractSelect implements Action.Container,
      */
     private Object[][] getVisibleCellsNoCache(int firstIndex, int rows,
             boolean replaceListeners) {
-        logger.finest("Render visible cells for rows " + firstIndex + "-"
-                + (firstIndex + rows - 1));
+        getLogger().finest(
+                "Render visible cells for rows " + firstIndex + "-"
+                        + (firstIndex + rows - 1));
         final Object[] colids = getVisibleColumns();
         final int cols = colids.length;
 
@@ -1954,8 +1958,9 @@ public class Table extends AbstractSelect implements Action.Container,
     }
 
     protected void registerComponent(Component component) {
-        logger.finest("Registered " + component.getClass().getSimpleName()
-                + ": " + component.getCaption());
+        getLogger().finest(
+                "Registered " + component.getClass().getSimpleName() + ": "
+                        + component.getCaption());
         if (component.getParent() != this) {
             component.setParent(this);
         }
@@ -1986,8 +1991,9 @@ public class Table extends AbstractSelect implements Action.Container,
      * @param count
      */
     private void unregisterComponentsAndPropertiesInRows(int firstIx, int count) {
-        logger.finest("Unregistering components in rows " + firstIx + "-"
-                + (firstIx + count - 1));
+        getLogger().finest(
+                "Unregistering components in rows " + firstIx + "-"
+                        + (firstIx + count - 1));
         Object[] colids = getVisibleColumns();
         if (pageBuffer != null && pageBuffer[CELL_ITEMID].length > 0) {
             int bufSize = pageBuffer[CELL_ITEMID].length;
@@ -2067,8 +2073,9 @@ public class Table extends AbstractSelect implements Action.Container,
      *            a set of components that should be unregistered.
      */
     protected void unregisterComponent(Component component) {
-        logger.finest("Unregistered " + component.getClass().getSimpleName()
-                + ": " + component.getCaption());
+        getLogger().finest(
+                "Unregistered " + component.getClass().getSimpleName() + ": "
+                        + component.getCaption());
         component.setParent(null);
         /*
          * Also remove property data sources to unregister listeners keeping the
@@ -2438,7 +2445,7 @@ public class Table extends AbstractSelect implements Action.Container,
                         .get("lastToBeRendered")).intValue();
             } catch (Exception e) {
                 // FIXME: Handle exception
-                logger.log(Level.FINER,
+                getLogger().log(Level.FINER,
                         "Could not parse the first and/or last rows.", e);
             }
 
@@ -2458,8 +2465,9 @@ public class Table extends AbstractSelect implements Action.Container,
                     }
                 }
             }
-            logger.finest("Client wants rows " + reqFirstRowToPaint + "-"
-                    + (reqFirstRowToPaint + reqRowsToPaint - 1));
+            getLogger().finest(
+                    "Client wants rows " + reqFirstRowToPaint + "-"
+                            + (reqFirstRowToPaint + reqRowsToPaint - 1));
             clientNeedsContentRefresh = true;
         }
 
@@ -2505,7 +2513,7 @@ public class Table extends AbstractSelect implements Action.Container,
                     }
                 } catch (final Exception e) {
                     // FIXME: Handle exception
-                    logger.log(Level.FINER,
+                    getLogger().log(Level.FINER,
                             "Could not determine column collapsing state", e);
                 }
                 clientNeedsContentRefresh = true;
@@ -2527,7 +2535,7 @@ public class Table extends AbstractSelect implements Action.Container,
                     }
                 } catch (final Exception e) {
                     // FIXME: Handle exception
-                    logger.log(Level.FINER,
+                    getLogger().log(Level.FINER,
                             "Could not determine column reordering state", e);
                 }
                 clientNeedsContentRefresh = true;
@@ -2817,8 +2825,9 @@ public class Table extends AbstractSelect implements Action.Container,
         target.startTag("prows");
 
         if (!shouldHideAddedRows()) {
-            logger.finest("Paint rows for add. Index: " + firstIx + ", count: "
-                    + count + ".");
+            getLogger().finest(
+                    "Paint rows for add. Index: " + firstIx + ", count: "
+                            + count + ".");
 
             // Partial row additions bypass the normal caching mechanism.
             Object[][] cells = getVisibleCellsInsertIntoCache(firstIx, count);
@@ -2841,8 +2850,9 @@ public class Table extends AbstractSelect implements Action.Container,
                         indexInRowbuffer, itemId);
             }
         } else {
-            logger.finest("Paint rows for remove. Index: " + firstIx
-                    + ", count: " + count + ".");
+            getLogger().finest(
+                    "Paint rows for remove. Index: " + firstIx + ", count: "
+                            + count + ".");
             removeRowsFromCacheAndFillBottom(firstIx, count);
             target.addAttribute("hide", true);
         }
@@ -5217,4 +5227,11 @@ public class Table extends AbstractSelect implements Action.Container,
         }
         super.setVisible(visible);
     }
+
+    private final Logger getLogger() {
+        if (logger == null) {
+            logger = Logger.getLogger(Table.class.getName());
+        }
+        return logger;
+    }
 }
diff --git a/src/com/vaadin/ui/TreeTable.java b/src/com/vaadin/ui/TreeTable.java
index 19ca27133b..ffdb25b041 100644
--- a/src/com/vaadin/ui/TreeTable.java
+++ b/src/com/vaadin/ui/TreeTable.java
@@ -50,9 +50,6 @@ import com.vaadin.ui.treetable.HierarchicalContainerOrderedWrapper;
 @ClientWidget(VTreeTable.class)
 public class TreeTable extends Table implements Hierarchical {
 
-    private static final Logger logger = Logger.getLogger(TreeTable.class
-            .getName());
-
     private interface ContainerStrategy extends Serializable {
         public int size();
 
@@ -223,9 +220,9 @@ public class TreeTable extends Table implements Hierarchical {
             boolean removed = openItems.remove(itemId);
             if (!removed) {
                 openItems.add(itemId);
-                logger.finest("Item " + itemId + " is now expanded");
+                getLogger().finest("Item " + itemId + " is now expanded");
             } else {
-                logger.finest("Item " + itemId + " is now collapsed");
+                getLogger().finest("Item " + itemId + " is now collapsed");
             }
             clearPreorderCache();
         }
@@ -787,4 +784,8 @@ public class TreeTable extends Table implements Hierarchical {
         requestRepaint();
     }
 
+    private static final Logger getLogger() {
+        return Logger.getLogger(TreeTable.class.getName());
+    }
+
 }