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 2008/03/16 12:53:27 UTC

svn commit: r637581 - /tiles/framework/branches/TILES_2_0_X/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java

Author: apetrelli
Date: Sun Mar 16 04:53:26 2008
New Revision: 637581

URL: http://svn.apache.org/viewvc?rev=637581&view=rev
Log:
TILES-265
Merge from trunk to TILES_2_0_X branch.
Fixed Javadoc and signature of TilesContainer.prepare.

Modified:
    tiles/framework/branches/TILES_2_0_X/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java

Modified: tiles/framework/branches/TILES_2_0_X/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java?rev=637581&r1=637580&r2=637581&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java Sun Mar 16 04:53:26 2008
@@ -80,11 +80,13 @@
     void endContext(Object... requestItems);
 
     /**
-     * @param definition the requested definition
+     * Executes a preparer.
+     *
+     * @param preparer The name of the preparer to execute.
      * @param requestItems the current request objects.
      * @throws TilesException is processing fails.
      */
-    void prepare(String definition, Object... requestItems) throws TilesException;
+    void prepare(String preparer, Object... requestItems) throws TilesException;
 
     /**
      * Render the given tiles request.