Author: ddewolf
Date: Tue Oct 31 11:57:14 2006
New Revision: 469626
URL: http://svn.apache.org/viewvc?view=rev&rev=469626
Log:
Removing the definitionName from the request context. Each context will be
associated with multiple/different definitions
Modified:
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesRequestContext.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesRequestContext.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesRequestContext.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
Modified:
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java?view=diff&rev=469626&r1=469625&r2=469626
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java
Tue Oct 31 11:57:14 2006
@@ -47,6 +47,6 @@
*
* @param request
*/
- void render(TilesRequestContext request) throws TilesException;
+ void render(TilesRequestContext request, String definition) throws
TilesException;
}
Modified:
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesRequestContext.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesRequestContext.java?view=diff&rev=469626&r1=469625&r2=469626
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesRequestContext.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesRequestContext.java
Tue Oct 31 11:57:14 2006
@@ -29,12 +29,6 @@
public interface TilesRequestContext {
/**
- * The definition currently being requested.
- * @return
- */
- String getDefinitionName();
-
- /**
* Return an immutable Map that maps header names to the first (or only)
* header value (as a String).
*/
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesRequestContext.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesRequestContext.java?view=diff&rev=469626&r1=469625&r2=469626
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesRequestContext.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesRequestContext.java
Tue Oct 31 11:57:14 2006
@@ -37,9 +37,6 @@
*/
public class PortletTilesRequestContext extends PortletTilesApplicationContext
implements TilesRequestContext {
- private String definitionName;
-
-
/**
* <p>The lazily instantiated <code>Map</code> of header name-value
* combinations (immutable).</p>
@@ -148,15 +145,6 @@
response = null;
super.release();
- }
-
-
- public String getDefinitionName() {
- return definitionName;
- }
-
- public void setDefinitionName(String definitionName) {
- this.definitionName = definitionName;
}
/**
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesRequestContext.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesRequestContext.java?view=diff&rev=469626&r1=469625&r2=469626
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesRequestContext.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesRequestContext.java
Tue Oct 31 11:57:14 2006
@@ -41,8 +41,6 @@
private HttpServletResponse response;
- private String definitionName;
-
/**
* <p>The lazily instantiated <code>Map</code> of header name-value
* combinations (immutable).</p>
@@ -91,14 +89,6 @@
initialize(request, response);
}
-
- public String getDefinitionName() {
- return definitionName;
- }
-
- public void setDefinitionName(String definitionName) {
- this.definitionName = definitionName;
- }
public Map getHeader() {
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java?view=diff&rev=469626&r1=469625&r2=469626
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
Tue Oct 31 11:57:14 2006
@@ -149,9 +149,8 @@
* @param request the TilesRequestContext
* @throws TilesException
*/
- public void render(TilesRequestContext request)
+ public void render(TilesRequestContext request, String definitionName)
throws TilesException {
- String definitionName = request.getDefinitionName();
ComponentDefinition definition =
definitionsFactory.getDefinition(definitionName, request);
