You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2007/02/05 14:17:41 UTC
svn commit: r503670 - in
/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib:
ContainerTagSupport.java InsertAttributeTag.java InsertDefinitionTag.java
InsertTemplateTag.java RenderTagSupport.java
Author: apetrelli
Date: Mon Feb 5 05:17:40 2007
New Revision: 503670
URL: http://svn.apache.org/viewvc?view=rev&rev=503670
Log:
TILES-96
InsertDefinitionTag and InsertAttributeTag now use a new custom ComponentContext.
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertAttributeTag.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertDefinitionTag.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTemplateTag.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java?view=diff&rev=503670&r1=503669&r2=503670
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java Mon Feb 5 05:17:40 2007
@@ -30,6 +30,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.BodyTagSupport;
import java.io.IOException;
@@ -68,9 +69,7 @@
*/
public int doStartTag() {
container = TilesAccess.getContainer(pageContext.getServletContext());
- if (container != null) {
- componentContext = container.getComponentContext(pageContext);
- }
+ componentContext = getComponentContext(pageContext);
return EVAL_BODY_BUFFERED;
}
@@ -108,5 +107,14 @@
return (role == null || req.isUserInRole(role));
}
+ protected ComponentContext getComponentContext(PageContext pageContext) {
+ ComponentContext componentContext = null;
+
+ if (container != null) {
+ componentContext = container.createComponentContext();
+ }
+
+ return componentContext;
+ }
}
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertAttributeTag.java?view=diff&rev=503670&r1=503669&r2=503670
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertAttributeTag.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertAttributeTag.java Mon Feb 5 05:17:40 2007
@@ -67,6 +67,6 @@
throw new TilesException("Attribute '" + name + "' not found.");
}
- container.render(pageContext, attr);
+ container.render(pageContext, componentContext, attr);
}
}
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertDefinitionTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertDefinitionTag.java?view=diff&rev=503670&r1=503669&r2=503670
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertDefinitionTag.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertDefinitionTag.java Mon Feb 5 05:17:40 2007
@@ -48,6 +48,6 @@
protected void render() throws JspException, TilesException {
- container.render(pageContext, name);
+ container.render(pageContext, componentContext, name);
}
}
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTemplateTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTemplateTag.java?view=diff&rev=503670&r1=503669&r2=503670
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTemplateTag.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTemplateTag.java Mon Feb 5 05:17:40 2007
@@ -22,11 +22,13 @@
package org.apache.tiles.taglib;
+import org.apache.tiles.ComponentContext;
import org.apache.tiles.context.jsp.JspUtil;
import org.apache.tiles.taglib.RenderTagSupport;
import org.apache.tiles.taglib.PutTagParent;
import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
/**
* This is the tag handler for <tiles:insertTemplate>, which includes a
@@ -51,5 +53,14 @@
JspUtil.doInclude(pageContext, template, flush);
}
-
+ @Override
+ protected ComponentContext getComponentContext(PageContext pageContext) {
+ ComponentContext componentContext = null;
+
+ if (container != null) {
+ componentContext = container.getComponentContext(pageContext);
+ }
+
+ return componentContext;
+ }
}
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java?view=diff&rev=503670&r1=503669&r2=503670
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java Mon Feb 5 05:17:40 2007
@@ -117,7 +117,7 @@
*/
protected void execute() throws TilesException, JspException, IOException {
if (preparer != null) {
- container.prepare(pageContext, preparer);
+ container.prepare(pageContext, componentContext, preparer);
}
render();
}