Author: hlship
Date: Wed Aug 18 01:06:30 2010
New Revision: 986542
URL: http://svn.apache.org/viewvc?rev=986542&view=rev
Log:
TAP5-1201: PageResponseRenderer.render() should call
RequestGlobabls.storeActivePageName(String pageName)
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRendererImpl.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRendererImpl.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRendererImpl.java?rev=986542&r1=986541&r2=986542&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRendererImpl.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRendererImpl.java
Wed Aug 18 01:06:30 2010
@@ -21,11 +21,14 @@ import org.apache.tapestry5.ContentType;
import org.apache.tapestry5.MarkupWriter;
import org.apache.tapestry5.internal.structure.Page;
import org.apache.tapestry5.services.MarkupWriterFactory;
+import org.apache.tapestry5.services.RequestGlobals;
import org.apache.tapestry5.services.Response;
import org.slf4j.Logger;
public class PageResponseRendererImpl implements PageResponseRenderer
{
+ private final RequestGlobals requestGlobals;
+
private final PageMarkupRenderer markupRenderer;
private final MarkupWriterFactory markupWriterFactory;
@@ -36,9 +39,11 @@ public class PageResponseRendererImpl im
private final Logger logger;
- public PageResponseRendererImpl(MarkupWriterFactory markupWriterFactory,
PageMarkupRenderer markupRenderer,
- PageContentTypeAnalyzer pageContentTypeAnalyzer, Response
response, Logger logger)
+ public PageResponseRendererImpl(RequestGlobals requestGlobals,
MarkupWriterFactory markupWriterFactory,
+ PageMarkupRenderer markupRenderer, PageContentTypeAnalyzer
pageContentTypeAnalyzer, Response response,
+ Logger logger)
{
+ this.requestGlobals = requestGlobals;
this.markupWriterFactory = markupWriterFactory;
this.markupRenderer = markupRenderer;
this.pageContentTypeAnalyzer = pageContentTypeAnalyzer;
@@ -50,6 +55,8 @@ public class PageResponseRendererImpl im
{
assert page != null;
+ requestGlobals.storeActivePageName(page.getName());
+
ContentType contentType =
pageContentTypeAnalyzer.findContentType(page);
// For the moment, the content type is all that's used determine the
model for the markup writer.
