You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ap...@apache.org on 2007/02/23 15:36:26 UTC

svn commit: r510959 - in /struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2: tiles/StrutsTilesContainerFactory.java views/tiles/TilesResult.java

Author: apetrelli
Date: Fri Feb 23 06:36:25 2007
New Revision: 510959

URL: http://svn.apache.org/viewvc?view=rev&rev=510959
Log:
Updated to follow the changes in Tiles API. See TILES-114.

Modified:
    struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
    struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java

Modified: struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java?view=diff&rev=510959&r1=510958&r2=510959
==============================================================================
--- struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java (original)
+++ struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java Fri Feb 23 06:36:25 2007
@@ -98,8 +98,8 @@
             return factory.createApplicationContext(context);
         }
 
-        public TilesRequestContext createRequestContext(TilesApplicationContext tilesApplicationContext, Object request, Object response) {
-            TilesRequestContext context = factory.createRequestContext(tilesApplicationContext, request, response);
+        public TilesRequestContext createRequestContext(TilesApplicationContext tilesApplicationContext, Object... requestItems) {
+            TilesRequestContext context = factory.createRequestContext(tilesApplicationContext, requestItems);
             return new StrutsTilesRequestContext(context);
         }
 

Modified: struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java?view=diff&rev=510959&r1=510958&r2=510959
==============================================================================
--- struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java (original)
+++ struts/struts2/trunk/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java Fri Feb 23 06:36:25 2007
@@ -101,6 +101,6 @@
         HttpServletRequest request = ServletActionContext.getRequest();
         HttpServletResponse response = ServletActionContext.getResponse();
 
-        container.render(request, response, location);
+        container.render(location, request, response);
     }
 }