Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java?rev=836180&r1=836179&r2=836180&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java Sat Nov 14 14:00:02 2009 @@ -52,12 +52,12 @@ public Attribute getAttribute(String key) { TilesContainer container = ServletUtil.getCurrentContainer( getRequest(), getServletContext()); - Request servletRequest = new ServletTilesRequestContext(container - .getApplicationContext(), getRequest(), getResponse()); - Request velocityRequest = new VelocityTilesRequestContext( - servletRequest, getVelocityContext(), null); - AttributeContext attributeContext = container - .getAttributeContext(velocityRequest); + Request servletRequest = new ServletTilesRequestContext(container + .getApplicationContext(), getRequest(), getResponse()); + Request velocityRequest = new VelocityTilesRequestContext( + servletRequest, getVelocityContext(), null); + AttributeContext attributeContext = container + .getAttributeContext(velocityRequest); Attribute attribute = attributeContext.getAttribute(key); return attribute; } @@ -108,8 +108,8 @@ public boolean render(InternalContextAdapter context, Writer writer) throws IOException { TilesContainer container = ServletUtil.getCurrentContainer(request, getServletContext()); - Request velocityRequest = createVelocityRequest(container, - writer); + Request velocityRequest = createVelocityRequest(container, + writer); container.render(attribute, velocityRequest); return true; } @@ -133,8 +133,8 @@ public boolean render(InternalContextAdapter context, Writer writer) throws IOException { TilesContainer container = ServletUtil.getCurrentContainer(request, getServletContext()); - Request velocityRequest = createVelocityRequest(container, - writer); + Request velocityRequest = createVelocityRequest(container, + writer); container.render(definitionName, velocityRequest); return true; } @@ -157,8 +157,8 @@ public boolean render(InternalContextAdapter context, Writer writer) throws IOException { TilesContainer container = ServletUtil.getCurrentContainer(request, getServletContext()); - Request velocityRequest = createVelocityRequest(container, - writer); + Request velocityRequest = createVelocityRequest(container, + writer); container.renderContext(velocityRequest); return true; } @@ -176,7 +176,7 @@ public AttributeContext startAttributeContext() { TilesContainer container = ServletUtil.getCurrentContainer( getRequest(), getServletContext()); - Request velocityRequest = createVelocityRequest(container, null); + Request velocityRequest = createVelocityRequest(container, null); return container.startContext(velocityRequest); } @@ -190,7 +190,7 @@ public VelocityStyleTilesTool endAttributeContext() { TilesContainer container = ServletUtil.getCurrentContainer( getRequest(), getServletContext()); - Request velocityRequest = createVelocityRequest(container, null); + Request velocityRequest = createVelocityRequest(container, null); container.endContext(velocityRequest); return this; } @@ -204,7 +204,7 @@ public AttributeContext getAttributeContext() { TilesContainer container = ServletUtil.getCurrentContainer( getRequest(), getServletContext()); - Request velocityRequest = createVelocityRequest(container, null); + Request velocityRequest = createVelocityRequest(container, null); return container.getAttributeContext(velocityRequest); } @@ -227,10 +227,10 @@ return ""; } - protected Request createVelocityRequest(TilesContainer container, - Writer writer) { - return VelocityTilesRequestContext.createVelocityRequest(container - .getApplicationContext(), getRequest(), getResponse(), - getVelocityContext(), writer); - } + protected Request createVelocityRequest(TilesContainer container, + Writer writer) { + return VelocityTilesRequestContext.createVelocityRequest(container + .getApplicationContext(), getRequest(), getResponse(), + getVelocityContext(), writer); + } }
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java?rev=836180&r1=836179&r2=836180&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java Sat Nov 14 14:00:02 2009 @@ -109,7 +109,7 @@ expect(container.getApplicationContext()).andReturn(applicationContext); expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); tModel.execute(eq(container), eq(writer), eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"), - eq("myDefaultValueRole"), eq("myDefaultValueType"), eq("myName"), eq(attribute), + eq("myDefaultValueRole"), eq("myDefaultValueType"), eq("myName"), eq(attribute), isA(VelocityTilesRequestContext.class)); replay(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext); @@ -141,7 +141,7 @@ expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack); tModel.start(eq(composeStack), eq(container), eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"), - eq("myDefaultValueRole"), eq("myDefaultValueType"), eq("myName"), eq(attribute), + eq("myDefaultValueRole"), eq("myDefaultValueType"), eq("myName"), eq(attribute), isA(VelocityTilesRequestContext.class)); replay(tModel, servletContext, container, request, response, velocityContext, applicationContext); Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeVModelTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeVModelTest.java?rev=836180&r1=836179&r2=836180&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeVModelTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeVModelTest.java Sat Nov 14 14:00:02 2009 @@ -98,7 +98,7 @@ expect(container.getApplicationContext()).andReturn(applicationContext); expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); expect(tModel.getImportedAttributes(eq(container), eq("myName"), eq("myToName"), eq(false), - isA(VelocityTilesRequestContext.class))).andReturn(attributes); + isA(VelocityTilesRequestContext.class))).andReturn(attributes); expect(internalContextAdapter.put("one", "value1")).andReturn("value1"); expect(internalContextAdapter.put("two", "value2")).andReturn("value2"); @@ -133,7 +133,7 @@ expect(container.getApplicationContext()).andReturn(applicationContext); expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); expect(tModel.getImportedAttributes(eq(container), eq("myName"), eq("myToName"), eq(false), - isA(VelocityTilesRequestContext.class))).andReturn(attributes); + isA(VelocityTilesRequestContext.class))).andReturn(attributes); request.setAttribute("one", "value1"); request.setAttribute("two", "value2"); @@ -169,7 +169,7 @@ expect(container.getApplicationContext()).andReturn(applicationContext); expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); expect(tModel.getImportedAttributes(eq(container), eq("myName"), eq("myToName"), eq(false), - isA(VelocityTilesRequestContext.class))).andReturn(attributes); + isA(VelocityTilesRequestContext.class))).andReturn(attributes); expect(request.getSession()).andReturn(session).times(2); session.setAttribute("one", "value1"); session.setAttribute("two", "value2"); @@ -205,7 +205,7 @@ expect(container.getApplicationContext()).andReturn(applicationContext); expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); expect(tModel.getImportedAttributes(eq(container), eq("myName"), eq("myToName"), eq(false), - isA(VelocityTilesRequestContext.class))).andReturn(attributes); + isA(VelocityTilesRequestContext.class))).andReturn(attributes); servletContext.setAttribute("one", "value1"); servletContext.setAttribute("two", "value2"); Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java?rev=836180&r1=836179&r2=836180&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java Sat Nov 14 14:00:02 2009 @@ -109,7 +109,7 @@ expect(container.getApplicationContext()).andReturn(applicationContext); expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); tModel.execute(eq(container), eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"), - eq("myDefaultValueRole"), eq("myDefaultValueType"), eq("myName"), eq(attribute), + eq("myDefaultValueRole"), eq("myDefaultValueType"), eq("myName"), eq(attribute), isA(VelocityTilesRequestContext.class)); replay(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext); @@ -141,7 +141,7 @@ expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack); tModel.start(eq(composeStack), eq(container), eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"), - eq("myDefaultValueRole"), eq("myDefaultValueType"), eq("myName"), eq(attribute), + eq("myDefaultValueRole"), eq("myDefaultValueType"), eq("myName"), eq(attribute), isA(VelocityTilesRequestContext.class)); replay(tModel, servletContext, container, request, response, velocityContext, applicationContext); Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java?rev=836180&r1=836179&r2=836180&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java Sat Nov 14 14:00:02 2009 @@ -101,8 +101,8 @@ expect(container.getApplicationContext()).andReturn(applicationContext); expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); tModel.execute(eq(container), eq("myDefinitionName"), eq("myTemplate"), - eq("myTemplateType"), eq("myTemplateExpression"), eq("myRole"), - eq("myPreparer"), isA(VelocityTilesRequestContext.class)); + eq("myTemplateType"), eq("myTemplateExpression"), eq("myRole"), + eq("myPreparer"), isA(VelocityTilesRequestContext.class)); replay(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext); initializeModel(); @@ -162,8 +162,8 @@ expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack); tModel.end(eq(container), eq("myDefinitionName"), eq("myTemplate"), - eq("myTemplateType"), eq("myTemplateExpression"), eq("myRole"), - eq("myPreparer"), isA(VelocityTilesRequestContext.class)); + eq("myTemplateType"), eq("myTemplateExpression"), eq("myRole"), + eq("myPreparer"), isA(VelocityTilesRequestContext.class)); replay(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext); initializeModel(); Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java?rev=836180&r1=836179&r2=836180&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java Sat Nov 14 14:00:02 2009 @@ -101,7 +101,7 @@ expect(container.getApplicationContext()).andReturn(applicationContext); expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); tModel.execute(eq(container), eq("myTemplate"), eq("myTemplateType"), - eq("myTemplateExpression"), eq("myRole"), eq("myPreparer"), + eq("myTemplateExpression"), eq("myRole"), eq("myPreparer"), isA(VelocityTilesRequestContext.class)); replay(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext); @@ -162,8 +162,8 @@ expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack); tModel.end(eq(container), eq("myTemplate"), eq("myTemplateType"), - eq("myTemplateExpression"), eq("myRole"), - eq("myPreparer"), isA(VelocityTilesRequestContext.class)); + eq("myTemplateExpression"), eq("myRole"), + eq("myPreparer"), isA(VelocityTilesRequestContext.class)); replay(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter, applicationContext); initializeModel(); Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java?rev=836180&r1=836179&r2=836180&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java Sat Nov 14 14:00:02 2009 @@ -97,8 +97,8 @@ expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) .andReturn(composeStack); tModel.execute(eq(container), eq(composeStack), eq("myName"), eq("myValue"), - eq("myExpression"), (String) isNull(), eq("myRole"), eq("myType"), - eq(false), isA(VelocityTilesRequestContext.class)); + eq("myExpression"), (String) isNull(), eq("myRole"), eq("myType"), + eq(false), isA(VelocityTilesRequestContext.class)); replay(tModel, container, servletContext, request, response, velocityContext, applicationContext); initializeModel(); @@ -156,8 +156,8 @@ .andReturn(composeStack); expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(parameterMapStack); tModel.end(eq(container), eq(composeStack), eq("myName"), eq("myValue"), - eq("myExpression"), (String) isNull(), eq("myRole"), eq("myType"), - eq(false), isA(VelocityTilesRequestContext.class)); + eq("myExpression"), (String) isNull(), eq("myRole"), eq("myType"), + eq(false), isA(VelocityTilesRequestContext.class)); replay(tModel, container, servletContext, request, response, velocityContext, applicationContext); initializeModel(); Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java?rev=836180&r1=836179&r2=836180&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java Sat Nov 14 14:00:02 2009 @@ -468,10 +468,10 @@ expect(container.getApplicationContext()).andReturn(applicationContext); expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); - expect( - container - .getAttributeContext(isA(VelocityTilesRequestContext.class))) - .andReturn(attributeContext); + expect( + container + .getAttributeContext(isA(VelocityTilesRequestContext.class))) + .andReturn(attributeContext); expect(attributeContext.getAttribute("myAttribute")).andReturn(attribute); replay(velocityContext, request, response, servletContext, container, attributeContext, applicationContext);
