Author: greddin
Date: Fri Oct 27 13:07:22 2006
New Revision: 468516
URL: http://svn.apache.org/viewvc?view=rev&rev=468516
Log:
SHALE-321. Updated TilesViewHandler to be compatible with the latest
Tiles 2 Snapshot API. The TilesContext class has been replaced by
TilesApplicationContext and TilesRequestContext. There were also changes
to TilesContextFactory that were integrated here.
Modified:
shale/framework/trunk/shale-tiles/src/main/java/org/apache/shale/tiles/TilesViewHandler.java
Modified:
shale/framework/trunk/shale-tiles/src/main/java/org/apache/shale/tiles/TilesViewHandler.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-tiles/src/main/java/org/apache/shale/tiles/TilesViewHandler.java?view=diff&rev=468516&r1=468515&r2=468516
==============================================================================
---
shale/framework/trunk/shale-tiles/src/main/java/org/apache/shale/tiles/TilesViewHandler.java
(original)
+++
shale/framework/trunk/shale-tiles/src/main/java/org/apache/shale/tiles/TilesViewHandler.java
Fri Oct 27 13:07:22 2006
@@ -35,9 +35,9 @@
import org.apache.tiles.ComponentDefinition;
import org.apache.tiles.DefinitionsFactoryException;
import org.apache.tiles.NoSuchDefinitionException;
+import org.apache.tiles.TilesRequestContext;
import org.apache.tiles.TilesUtil;
-import org.apache.tiles.TilesContext;
-import org.apache.tiles.context.TilesContextFactory;
+import org.apache.tiles.context.BasicTilesContextFactory;
/**
* This view handler strips the suffix off of the view ID and looks
@@ -258,10 +258,13 @@
.getExternalContext();
Object request = externalContext.getRequest();
Object context = externalContext.getContext();
+ Object response = externalContext.getResponse();
ComponentDefinition tile = null;
try {
- TilesContext tilesContext = TilesContextFactory.getInstance(context,
request);
- tile = TilesUtil.getDefinition(name, tilesContext);
+ TilesRequestContext tilesContext =
+ new BasicTilesContextFactory().createRequestContext(context,
+ request, response);
+ tile = TilesUtil.getDefinition(name, tilesContext);
} catch (NoSuchDefinitionException nsex) {
log.error("Couldn't find Tiles definition.", nsex);
} catch (DefinitionsFactoryException dex) {
@@ -300,7 +303,10 @@
throws java.io.IOException {
Object request = externalContext.getRequest();
Object context = externalContext.getContext();
- TilesContext tilesContext = TilesContextFactory.getInstance(context,
request);
+ Object response = externalContext.getResponse();
+ TilesRequestContext tilesContext =
+ new BasicTilesContextFactory().createRequestContext(context,
+ request, response);
ComponentContext tileContext = ComponentContext.getContext(tilesContext);
if (tileContext == null) {
tileContext = new ComponentContext(tile.getAttributes());