Author: craigmcc Date: Tue Aug 23 17:04:30 2005 New Revision: 239490 URL: http://svn.apache.org/viewcvs?rev=239490&view=rev Log: Adapt to refactoring in standalone Tiles.
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=239490&r1=239489&r2=239490&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:04:30 2005 @@ -264,17 +264,21 @@ 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 = TilesUtil.getDefinition(name, request, servletContext); + tile = factory.readDefinitions().getDefinition(name); } catch(NoSuchDefinitionException nsex) { /* not here */ } catch(DefinitionsFactoryException dex) { /* not here */ } if (tile == null && name.startsWith("/")) { // try again w/o slash... try { - tile = TilesUtil.getDefinition(name.substring(1), - request, servletContext); + tile = factory.readDefinitions().getDefinition(name.substring(1)); } catch(NoSuchDefinitionException nsdex) { /* not here */ } catch(DefinitionsFactoryException dfex) { /* not here */ } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]