svn commit: r1149298 - in /tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5: internal/transform/InvokePostRenderCleanupOnResourcesWorker.java internal/transform/RenderCommandWorker.java services/TapestryModule.java

[hlship]

Author: hlship
Date: Thu Jul 21 18:20:19 2011
New Revision: 1149298

URL: http://svn.apache.org/viewvc?rev=1149298&view=rev
Log:
TAP5-1585: Merge InvokePostRenderCleanupOnResourcesWorker into 
RenderCommandWorker

Removed:
    
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InvokePostRenderCleanupOnResourcesWorker.java
Modified:
    
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RenderCommandWorker.java
    
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java

Modified: 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RenderCommandWorker.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RenderCommandWorker.java?rev=1149298&r1=1149297&r2=1149298&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RenderCommandWorker.java
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RenderCommandWorker.java
 Thu Jul 21 18:20:19 2011
@@ -23,12 +23,14 @@ import org.apache.tapestry5.plastic.Plas
 import org.apache.tapestry5.plastic.PlasticUtils;
 import org.apache.tapestry5.runtime.RenderCommand;
 import org.apache.tapestry5.runtime.RenderQueue;
+import org.apache.tapestry5.services.TransformConstants;
 import org.apache.tapestry5.services.transform.ComponentClassTransformWorker2;
 import org.apache.tapestry5.services.transform.TransformationSupport;
 
 /**
  * Ensures that all components implement {@link RenderCommand} by delegating to
  * {@link InternalComponentResources#render(org.apache.tapestry5.MarkupWriter, 
org.apache.tapestry5.runtime.RenderQueue)}.
+ * This is also responsible for invoking {@link 
org.apache.tapestry5.internal.InternalComponentResources#postRenderCleanup()}
  */
 public class RenderCommandWorker implements ComponentClassTransformWorker2
 {
@@ -49,5 +51,7 @@ public class RenderCommandWorker impleme
         PlasticField resourcesField = 
plasticClass.introduceField(InternalComponentResources.class, 
"resources").injectFromInstanceContext();
 
         
plasticClass.introduceMethod(RENDER_DESCRIPTION).delegateTo(resourcesField);
+
+        
plasticClass.introduceMethod(TransformConstants.POST_RENDER_CLEANUP_DESCRIPTION).delegateTo(resourcesField);
     }
 }

Modified: 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java?rev=1149298&r1=1149297&r2=1149298&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
 Thu Jul 21 18:20:19 2011
@@ -581,9 +581,6 @@ public final class TapestryModule
      * <dd>Converts fields that reference application state objects
      * <dt>RenderPhase</dt>
      * <dd>Link in render phaes methods</dd>
-     * <dt>InvokePostRenderCleanupOnResources</dt>
-     * <dd>Makes sure {@link 
org.apache.tapestry5.internal.InternalComponentResources#postRenderCleanup()} 
is invoked
-     * after a component finishes rendering</dd>
      * <dt>Cached</dt>
      * <dd>Checks for the {@link org.apache.tapestry5.annotations.Cached} 
annotation</dd>
      * <dt>Log</dt>
@@ -632,9 +629,6 @@ public final class TapestryModule
 
         configuration.addInstance("DiscardAfter", DiscardAfterWorker.class);
 
-        configuration.add("InvokePostRenderCleanupOnResources", new 
InvokePostRenderCleanupOnResourcesWorker());
-
-
         configuration.addInstance("Log", LogWorker.class);
 
         configuration.addInstance("PageReset", 
PageResetAnnotationWorker.class);