struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
Subject svn commit: r521644 - in /struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2: actions/TilesAction.java commands/TilesPreProcessor.java preparer/ActionPreparer.java preparer/UrlPreparer.java
Date Fri, 23 Mar 2007 09:32:54 GMT
Author: apetrelli
Date: Fri Mar 23 02:32:53 2007
New Revision: 521644

URL: http://svn.apache.org/viewvc?view=rev&rev=521644
Log:
STR-3017
Tiles 2 integration module aligned to code refactoring of Tiles 2.

Modified:
    struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/TilesAction.java
    struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java
    struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/ActionPreparer.java
    struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/UrlPreparer.java

Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/TilesAction.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/TilesAction.java?view=diff&rev=521644&r1=521643&r2=521644
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/TilesAction.java
(original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/TilesAction.java
Fri Mar 23 02:32:53 2007
@@ -29,7 +29,7 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.apache.tiles.ComponentContext;
+import org.apache.tiles.AttributeContext;
 import org.apache.tiles.access.TilesAccess;
 
 /**
@@ -38,7 +38,7 @@
  * called when action is invoked. The difference is, that the execute() method takes
  * an additional parameter : tile context.
  * This class extends Struts Action. Subclasses should override
- * execute(ComponentContext ...) method instead of Struts
+ * execute(AttributeContext ...) method instead of Struts
  * execute(ActionMapping ...) method.
  * @version $Rev$ $Date$
  */
@@ -66,8 +66,8 @@
         throws Exception {
 
         // Try to retrieve tile context
-        ComponentContext context = TilesAccess.getContainer(request.getSession()
-        		.getServletContext()).getComponentContext(request, response);
+        AttributeContext context = TilesAccess.getContainer(request.getSession()
+        		.getServletContext()).getAttributeContext(request, response);
         if (context == null) {
             throw new ServletException(
                 "Can't find Tile context for '"
@@ -96,7 +96,7 @@
      * @since Struts 1.1
      */
     public ActionForward execute(
-        ComponentContext context,
+        AttributeContext context,
         ActionMapping mapping,
         ActionForm form,
         HttpServletRequest request,

Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java?view=diff&rev=521644&r1=521643&r2=521644
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java
(original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java
Fri Mar 23 02:32:53 2007
@@ -70,7 +70,7 @@
      * to a <code>RequestDispatcher</code>.</p>
      *
      * <p>Note that if the command finds a previously existing
-     * <code>ComponentContext</code> in the request, then it
+     * <code>AttributeContext</code> in the request, then it
      * infers that it has been called from within another tile,
      * so instead of changing the <code>ForwardConfig</code> in the chain
      * <code>Context</code>, the command uses <code>RequestDispatcher</code>

Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/ActionPreparer.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/ActionPreparer.java?view=diff&rev=521644&r1=521643&r2=521644
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/ActionPreparer.java
(original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/ActionPreparer.java
Fri Mar 23 02:32:53 2007
@@ -22,7 +22,7 @@
 package org.apache.struts.tiles2.preparer;
 
 import org.apache.struts.action.Action;
-import org.apache.tiles.ComponentContext;
+import org.apache.tiles.AttributeContext;
 import org.apache.tiles.TilesException;
 import org.apache.tiles.context.TilesRequestContext;
 import org.apache.tiles.context.servlet.ServletTilesRequestContext;
@@ -49,7 +49,7 @@
     }
 
     public void execute(TilesRequestContext tilesContext,
-            ComponentContext componentContext) throws Exception {
+            AttributeContext attributeContext) throws Exception {
         if (tilesContext instanceof ServletTilesRequestContext) {
             ServletTilesRequestContext servletTilesContext =
                     (ServletTilesRequestContext) tilesContext;

Modified: struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/UrlPreparer.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/UrlPreparer.java?view=diff&rev=521644&r1=521643&r2=521644
==============================================================================
--- struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/UrlPreparer.java
(original)
+++ struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/UrlPreparer.java
Fri Mar 23 02:32:53 2007
@@ -26,7 +26,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.tiles.ComponentContext;
+import org.apache.tiles.AttributeContext;
 import org.apache.tiles.context.TilesRequestContext;
 import org.apache.tiles.context.servlet.ServletTilesRequestContext;
 import org.apache.tiles.preparer.ViewPreparer;
@@ -43,7 +43,7 @@
     }
 
     public void execute(TilesRequestContext tilesContext,
-            ComponentContext componentContext) throws Exception {
+            AttributeContext attributeContext) throws Exception {
         
         if (tilesContext instanceof ServletTilesRequestContext) {
             ServletTilesRequestContext servletTilesContext =



Mime
View raw message