Author: apetrelli
Date: Wed Mar 25 22:50:34 2009
New Revision: 758456
URL: http://svn.apache.org/viewvc?rev=758456&view=rev
Log:
TILES-385
Removed "name" parameter from DefinitionModel.end.
Modified:
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/DefinitionFMModel.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java
tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/DefinitionModelTest.java
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionVModel.java
Modified:
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/DefinitionFMModel.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/DefinitionFMModel.java?rev=758456&r1=758455&r2=758456&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/DefinitionFMModel.java
(original)
+++
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/DefinitionFMModel.java
Wed Mar 25 22:50:34 2009
@@ -38,7 +38,7 @@
/**
* Wraps {...@link DefinitionModel} to be used in FreeMarker. For the list of
* parameters, see {...@link DefinitionModel#start(Stack, String, String,
String, String, String)} and
- * {...@link DefinitionModel#end(MutableTilesContainer, Stack, String,
Object...)}.
+ * {...@link DefinitionModel#end(MutableTilesContainer, Stack, Object...)}.
*
* @version $Rev$ $Date$
* @since 2.2.0
@@ -74,7 +74,7 @@
FreeMarkerUtil.evaluateBody(body);
model.end((MutableTilesContainer) FreeMarkerUtil
.getCurrentContainer(env), FreeMarkerUtil.getComposeStack(env),
- FreeMarkerUtil.getAsString(parms.get("name")), env);
+ env);
}
}
Modified:
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java?rev=758456&r1=758455&r2=758456&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java
(original)
+++
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java
Wed Mar 25 22:50:34 2009
@@ -178,7 +178,7 @@
TilesContainer container = JspUtil.getCurrentContainer(pageContext);
if (container instanceof MutableTilesContainer) {
model.end((MutableTilesContainer) container, JspUtil
- .getComposeStack(pageContext), name, pageContext);
+ .getComposeStack(pageContext), pageContext);
} else {
throw new TilesJspException("The current container is not
mutable");
}
Modified:
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java?rev=758456&r1=758455&r2=758456&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java
(original)
+++
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java
Wed Mar 25 22:50:34 2009
@@ -65,12 +65,11 @@
*
* @param container The Tiles container to use. It must be "mutable".
* @param composeStack The compose stack.
- * @param name The name of the definition to create. If not specified, an
anonymous definition will be created.
* @param requestItems The request objects.
* @since 2.2.0
*/
public void end(MutableTilesContainer container,
- Stack<Object> composeStack, String name, Object... requestItems) {
+ Stack<Object> composeStack, Object... requestItems) {
Definition definition = (Definition) composeStack.pop();
registerDefinition(definition, container, composeStack, requestItems);
}
Modified:
tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/DefinitionModelTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/DefinitionModelTest.java?rev=758456&r1=758455&r2=758456&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/DefinitionModelTest.java
(original)
+++
tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/DefinitionModelTest.java
Wed Mar 25 22:50:34 2009
@@ -49,7 +49,7 @@
}
/**
- * Test method for {...@link
org.apache.tiles.template.DefinitionModel#end(org.apache.tiles.mgmt.MutableTilesContainer,
java.util.Stack, java.lang.String, java.lang.Object[])}.
+ * Test method for {...@link
org.apache.tiles.template.DefinitionModel#end(org.apache.tiles.mgmt.MutableTilesContainer,
java.util.Stack, java.lang.Object[])}.
*/
@Test
public void testEnd() {
@@ -62,12 +62,12 @@
container.register(definition, requestItem);
replay(container);
- model.end(container, composeStack, "myName", requestItem);
+ model.end(container, composeStack, requestItem);
verify(container);
}
/**
- * Test method for {...@link
org.apache.tiles.template.DefinitionModel#end(org.apache.tiles.mgmt.MutableTilesContainer,
java.util.Stack, java.lang.String, java.lang.Object[])}.
+ * Test method for {...@link
org.apache.tiles.template.DefinitionModel#end(org.apache.tiles.mgmt.MutableTilesContainer,
java.util.Stack, java.lang.Object[])}.
*/
@Test
public void testEndInAttribute() {
@@ -82,7 +82,7 @@
container.register(definition, requestItem);
replay(container);
- model.end(container, composeStack, "myName", requestItem);
+ model.end(container, composeStack, requestItem);
assertEquals(1, composeStack.size());
attribute = (Attribute) composeStack.peek();
assertEquals(definition.getName(), attribute.getValue());
Modified:
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionVModel.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionVModel.java?rev=758456&r1=758455&r2=758456&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionVModel.java
(original)
+++
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionVModel.java
Wed Mar 25 22:50:34 2009
@@ -91,8 +91,8 @@
model
.end((MutableTilesContainer) ServletUtil.getCurrentContainer(
request, servletContext), ServletUtil
- .getComposeStack(request), (String) params.get("name"),
- velocityContext, request, response);
+ .getComposeStack(request), velocityContext,
+ request, response);
return VelocityUtil.EMPTY_RENDERABLE;
}
