svn commit: r734997 - in /tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker: context/FreeMarkerTilesRequestContextFactory.java template/AbstractRenderModel.java

[apetrelli]

Author: apetrelli
Date: Fri Jan 16 05:29:59 2009
New Revision: 734997

URL: http://svn.apache.org/viewvc?rev=734997&view=rev
Log:
TILESSB-2
Removed static references to logging objects.
Refactoring to follow checkstyle rules.

Modified:
    
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java
    
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AbstractRenderModel.java

Modified: 
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java?rev=734997&r1=734996&r2=734997&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java
 (original)
+++ 
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java
 Fri Jan 16 05:29:59 2009
@@ -20,7 +20,7 @@
 public class FreeMarkerTilesRequestContextFactory implements
         TilesRequestContextFactory, TilesRequestContextFactoryAware {
 
-    private static final Log LOG = 
LogFactory.getLog(FreeMarkerTilesRequestContextFactory.class);
+    private final Log log = 
LogFactory.getLog(FreeMarkerTilesRequestContextFactory.class);
     
     /**
      * Parent Tiles context factory.
@@ -41,7 +41,7 @@
             try {
                 requestModel = FreeMarkerUtil.getRequestHashModel(env);
             } catch (FreeMarkerTilesException e) {
-                LOG.warn("Cannot evaluate as a FreeMarker in Servlet 
Environment, skipping", e);
+                log.warn("Cannot evaluate as a FreeMarker in Servlet 
Environment, skipping", e);
                 return null;
             }
             HttpServletRequest request = requestModel.getRequest();

Modified: 
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AbstractRenderModel.java
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AbstractRenderModel.java?rev=734997&r1=734996&r2=734997&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AbstractRenderModel.java
 (original)
+++ 
tiles/sandbox/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AbstractRenderModel.java
 Fri Jan 16 05:29:59 2009
@@ -58,7 +58,7 @@
     /**
      * The log instance for this tag.
      */
-    private static final Log LOG = 
LogFactory.getLog(AbstractRenderModel.class);
+    private final Log log = LogFactory.getLog(AbstractRenderModel.class);
 
     protected TilesContainer container;
     
@@ -87,7 +87,7 @@
             }
         } catch (IOException io) {
             String message = "IO Error executing tag: " + io.getMessage();
-            LOG.error(message, io);
+            log.error(message, io);
             throw new FreeMarkerTilesException(message, io);
         } finally {
             endContext(env, params, loopVars, body);