Author: dgeary
Date: Tue Aug 23 17:36:40 2005
New Revision: 239492
URL: http://svn.apache.org/viewcvs?rev=239492&view=rev
Log:
Aligned Tiles view handler with latest mods to standalone Tiles, hopefully for
the last time. 8-)
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/TilesViewHandler.java
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/TilesViewHandler.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/TilesViewHandler.java?rev=239492&r1=239491&r2=239492&view=diff
==============================================================================
---
struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/TilesViewHandler.java
(original)
+++
struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/TilesViewHandler.java
Tue Aug 23 17:36:40 2005
@@ -264,21 +264,16 @@
ServletRequest request = (ServletRequest)externalContext.getRequest();
ServletContext servletContext = (ServletContext)externalContext.
getContext();
- DefinitionsFactory factory = TilesUtil.getDefinitionsFactory(request,
- servletContext);
- if (factory == null)
- return null;
-
ComponentDefinition tile = null;
try {
- tile = factory.readDefinitions().getDefinition(name);
+ tile = TilesUtil.getDefinition(name, request, servletContext);
}
catch(NoSuchDefinitionException nsex) { /* not here */ }
catch(DefinitionsFactoryException dex) { /* not here */ }
if (tile == null && name.startsWith("/")) { // try again w/o slash...
try {
- tile = factory.readDefinitions().getDefinition(name.substring(1));
+ tile = TilesUtil.getDefinition(name, request, servletContext);
}
catch(NoSuchDefinitionException nsdex) { /* not here */ }
catch(DefinitionsFactoryException dfex) { /* not here */ }
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
