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 2009/04/01 22:20:50 UTC
svn commit: r761041 - in /tiles/framework/trunk/tiles-template/src:
main/java/org/apache/tiles/template/AddListAttributeModel.java
test/java/org/apache/tiles/template/AddListAttributeModelTest.java
Author: apetrelli
Date: Wed Apr 1 20:20:50 2009
New Revision: 761041
URL: http://svn.apache.org/viewvc?rev=761041&view=rev
Log:
TILES-389
Now the child ListAttribute is put in the parent.
Modified:
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java
tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java
Modified: tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java?rev=761041&r1=761040&r2=761041&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java (original)
+++ tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java Wed Apr 1 20:20:50 2009
@@ -58,10 +58,11 @@
* Ends the operation.
*
* @param composeStack The composing stack.
- * @return The composed list attributes.
* @since 2.2.0
*/
- public ListAttribute end(Stack<Object> composeStack) {
- return (ListAttribute) composeStack.pop();
+ public void end(Stack<Object> composeStack) {
+ ListAttribute listAttribute = (ListAttribute) composeStack.pop();
+ ListAttribute parent = (ListAttribute) composeStack.peek();
+ parent.add(listAttribute);
}
}
Modified: tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java?rev=761041&r1=761040&r2=761041&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java (original)
+++ tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java Wed Apr 1 20:20:50 2009
@@ -5,8 +5,10 @@
import static org.junit.Assert.*;
+import java.util.List;
import java.util.Stack;
+import org.apache.tiles.Attribute;
import org.apache.tiles.ListAttribute;
import org.junit.Before;
import org.junit.Test;
@@ -45,13 +47,20 @@
/**
* Test method for {@link org.apache.tiles.template.AddListAttributeModel#end(java.util.Stack)}.
*/
+ @SuppressWarnings("unchecked")
@Test
public void testEnd() {
Stack<Object> composeStack = new Stack<Object>();
ListAttribute listAttribute = new ListAttribute();
+ ListAttribute parent = new ListAttribute();
+ composeStack.push(parent);
composeStack.push(listAttribute);
model.end(composeStack);
- assertEquals(0, composeStack.size());
+ assertEquals(1, composeStack.size());
+ assertEquals(parent, composeStack.peek());
+ List<Attribute> attributes = (List<Attribute>) parent.getValue();
+ assertEquals(1, attributes.size());
+ assertEquals(listAttribute, attributes.get(0));
}
}