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 2010/01/29 17:41:26 UTC
svn commit: r904552 - in /tiles/framework/trunk:
src/site/apt/tutorial/integration/
tiles-velocity/src/main/java/org/apache/tiles/velocity/template/
tiles-velocity/src/test/java/org/apache/tiles/velocity/template/
Author: apetrelli
Date: Fri Jan 29 16:41:26 2010
New Revision: 904552
URL: http://svn.apache.org/viewvc?rev=904552&view=rev
Log:
TILES-491
Modified VelocityStyleTilesTool to make the API simpler.
Modified:
tiles/framework/trunk/src/site/apt/tutorial/integration/velocity.apt
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java
Modified: tiles/framework/trunk/src/site/apt/tutorial/integration/velocity.apt
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/src/site/apt/tutorial/integration/velocity.apt?rev=904552&r1=904551&r2=904552&view=diff
==============================================================================
--- tiles/framework/trunk/src/site/apt/tutorial/integration/velocity.apt (original)
+++ tiles/framework/trunk/src/site/apt/tutorial/integration/velocity.apt Fri Jan 29 16:41:26 2010
@@ -124,7 +124,7 @@
$attribute.setRenderer("velocity")
$attributeContext.putAttribute("body", $attribute})
-$tilesAlt.renderAttribute($templateAttribute)
+$tilesAlt.render($templateAttribute)
$tilesAlt.endAttributeContext()
----------------------------------
Modified: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java?rev=904552&r1=904551&r2=904552&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java Fri Jan 29 16:41:26 2010
@@ -46,7 +46,7 @@
* @return The Attribute.
* @since 2.2.0
*/
- public Attribute getAttribute(String key) {
+ public Attribute get(String key) {
TilesContainer container = ServletUtil.getCurrentContainer(
getRequest(), getServletContext());
AttributeContext attributeContext = container.getAttributeContext(
@@ -72,7 +72,7 @@
* @return The copied attribute.
* @since 2.2.0
*/
- public Attribute cloneAttribute(Attribute attribute) {
+ public Attribute clone(Attribute attribute) {
return new Attribute(attribute);
}
@@ -94,7 +94,7 @@
* @return The renderable object, ready to be rendered.
* @since 2.2.0
*/
- public Renderable renderAttribute(final Attribute attribute) {
+ public Renderable render(final Attribute attribute) {
return new AbstractDefaultToStringRenderable(getVelocityContext(),
null, getResponse(), getRequest()) {
@@ -121,8 +121,7 @@
return new AbstractDefaultToStringRenderable(getVelocityContext(),
null, getResponse(), getRequest()) {
- public boolean render(InternalContextAdapter context, Writer writer)
- throws IOException {
+ public boolean render(InternalContextAdapter context, Writer writer) {
TilesContainer container = ServletUtil.getCurrentContainer(request, getServletContext());
container.render(definitionName, velocityContext, request, response, writer);
return true;
@@ -143,8 +142,7 @@
return new AbstractDefaultToStringRenderable(getVelocityContext(),
null, getResponse(), getRequest()) {
- public boolean render(InternalContextAdapter context, Writer writer)
- throws IOException {
+ public boolean render(InternalContextAdapter context, Writer writer) {
TilesContainer container = ServletUtil.getCurrentContainer(request, getServletContext());
container.renderContext(velocityContext, request, response, writer);
return true;
Modified: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java?rev=904552&r1=904551&r2=904552&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java Fri Jan 29 16:41:26 2010
@@ -455,7 +455,7 @@
}
/**
- * Test method for {@link org.apache.tiles.velocity.template.Tiles2Tool#getAttribute(java.lang.String)}.
+ * Test method for {@link org.apache.tiles.velocity.template.Tiles2Tool#get(java.lang.String)}.
*/
@Test
public void testGetAttribute() {
@@ -469,7 +469,7 @@
replay(velocityContext, request, response, servletContext, container, attributeContext);
initializeTool();
- assertEquals(attribute, tool.getAttribute("myAttribute"));
+ assertEquals(attribute, tool.get("myAttribute"));
verify(velocityContext, request, response, servletContext, container, attributeContext);
}
Modified: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java?rev=904552&r1=904551&r2=904552&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java Fri Jan 29 16:41:26 2010
@@ -90,7 +90,7 @@
}
/**
- * Test method for {@link org.apache.tiles.velocity.template.VelocityStyleTilesTool#getAttribute(java.lang.String)}.
+ * Test method for {@link org.apache.tiles.velocity.template.VelocityStyleTilesTool#get(java.lang.String)}.
*/
@Test
public void testGetAttribute() {
@@ -106,7 +106,7 @@
replay(velocityContext, request, response, servletContext, container, attributeContext);
initializeTool();
- assertEquals(attribute, tool.getAttribute("myAttribute"));
+ assertEquals(attribute, tool.get("myAttribute"));
verify(velocityContext, request, response, servletContext, container, attributeContext);
}
@@ -126,7 +126,7 @@
/**
* Test method for {@link org.apache.tiles.velocity.template.VelocityStyleTilesTool
- * #cloneAttribute(org.apache.tiles.Attribute)}.
+ * #clone(org.apache.tiles.Attribute)}.
*/
@Test
public void testCloneAttribute() {
@@ -136,7 +136,7 @@
replay(velocityContext, request, response, servletContext);
initializeTool();
- assertEquals(attribute, tool.cloneAttribute(attribute));
+ assertEquals(attribute, tool.clone(attribute));
verify(velocityContext, request, response, servletContext);
}
@@ -156,7 +156,7 @@
/**
* Test method for {@link org.apache.tiles.velocity.template.VelocityStyleTilesTool
- * #renderAttribute(org.apache.tiles.Attribute)}.
+ * #render(org.apache.tiles.Attribute)}.
* @throws IOException If something goes wrong.
*/
@Test
@@ -172,7 +172,7 @@
replay(velocityContext, request, response, servletContext, container, internalContextAdapter);
initializeTool();
- Renderable renderable = tool.renderAttribute(attribute);
+ Renderable renderable = tool.render(attribute);
renderable.render(internalContextAdapter, writer);
verify(velocityContext, request, response, servletContext, container, internalContextAdapter);
}