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/02/21 21:32:32 UTC
svn commit: r912397 - in /tiles/sandbox/trunk:
tiles-request/tiles-request-api/
tiles3/tiles-api/src/main/java/org/apache/tiles/
tiles3/tiles-api/src/test/java/org/apache/tiles/
tiles3/tiles-core/src/main/java/org/apache/tiles/impl/ tiles3/tiles-templa...
Author: apetrelli
Date: Sun Feb 21 20:32:31 2010
New Revision: 912397
URL: http://svn.apache.org/viewvc?rev=912397&view=rev
Log:
TILESSB-10
Removed ArrayStack and used LinkedList instead that implements Deque.
Removed:
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/ArrayStack.java
tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/ArrayStackTest.java
Modified:
tiles/sandbox/trunk/tiles-request/tiles-request-api/pom.xml
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/AddAttributeModel.java
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/ComposeStackUtil.java
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java
tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java
tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/AddAttributeModelTest.java
tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java
tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/ComposeStackUtilTest.java
tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/DefinitionModelTest.java
tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java
tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/PutAttributeModelTest.java
tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/PutListAttributeModelTest.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java
Modified: tiles/sandbox/trunk/tiles-request/tiles-request-api/pom.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-request/tiles-request-api/pom.xml?rev=912397&r1=912396&r2=912397&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-request/tiles-request-api/pom.xml (original)
+++ tiles/sandbox/trunk/tiles-request/tiles-request-api/pom.xml Sun Feb 21 20:32:31 2010
@@ -11,4 +11,12 @@
<version>1.0-SNAPSHOT</version>
<name>Tiles request - API</name>
<description>API for the Tiles Request framework.</description>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java?rev=912397&r1=912396&r2=912397&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java Sun Feb 21 20:32:31 2010
@@ -21,8 +21,9 @@
package org.apache.tiles.impl;
import java.io.IOException;
+import java.util.Deque;
+import java.util.LinkedList;
-import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.BasicAttributeContext;
@@ -102,7 +103,7 @@
/** {@inheritDoc} */
public AttributeContext startContext(Request request) {
AttributeContext context = new BasicAttributeContext();
- ArrayStack<AttributeContext> stack = getContextStack(request);
+ Deque<AttributeContext> stack = getContextStack(request);
if (!stack.isEmpty()) {
AttributeContext parent = stack.peek();
context.inheritCascadedAttributes(parent);
@@ -297,12 +298,12 @@
* @since 2.0.6
*/
@SuppressWarnings("unchecked")
- protected ArrayStack<AttributeContext> getContextStack(Request tilesContext) {
- ArrayStack<AttributeContext> contextStack =
- (ArrayStack<AttributeContext>) tilesContext
+ protected Deque<AttributeContext> getContextStack(Request tilesContext) {
+ Deque<AttributeContext> contextStack =
+ (Deque<AttributeContext>) tilesContext
.getContext("request").get(ATTRIBUTE_CONTEXT_STACK);
if (contextStack == null) {
- contextStack = new ArrayStack<AttributeContext>();
+ contextStack = new LinkedList<AttributeContext>();
tilesContext.getContext("request").put(ATTRIBUTE_CONTEXT_STACK,
contextStack);
}
@@ -319,7 +320,7 @@
*/
protected void pushContext(AttributeContext context,
Request tilesContext) {
- ArrayStack<AttributeContext> contextStack = getContextStack(tilesContext);
+ Deque<AttributeContext> contextStack = getContextStack(tilesContext);
contextStack.push(context);
}
@@ -331,7 +332,7 @@
* @since 2.0.6
*/
protected AttributeContext popContext(Request tilesContext) {
- ArrayStack<AttributeContext> contextStack = getContextStack(tilesContext);
+ Deque<AttributeContext> contextStack = getContextStack(tilesContext);
return contextStack.pop();
}
@@ -343,7 +344,7 @@
* @since 2.0.6
*/
protected AttributeContext getContext(Request tilesContext) {
- ArrayStack<AttributeContext> contextStack = getContextStack(tilesContext);
+ Deque<AttributeContext> contextStack = getContextStack(tilesContext);
if (!contextStack.isEmpty()) {
return contextStack.peek();
}
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/AddAttributeModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/AddAttributeModel.java?rev=912397&r1=912396&r2=912397&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/AddAttributeModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/AddAttributeModel.java Sun Feb 21 20:32:31 2010
@@ -22,8 +22,8 @@
package org.apache.tiles.template;
import java.io.IOException;
+import java.util.Deque;
-import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.Expression;
import org.apache.tiles.ListAttribute;
@@ -64,7 +64,7 @@
String type, Request request, ModelBody modelBody)
throws IOException {
Attribute attribute = new Attribute();
- ArrayStack<Object> composeStack = ComposeStackUtil.getComposeStack(request);
+ Deque<Object> composeStack = ComposeStackUtil.getComposeStack(request);
composeStack.push(attribute);
String body = modelBody.evaluateAsString();
attribute = (Attribute) composeStack.pop();
@@ -89,7 +89,7 @@
* @since 2.2.0
*/
private void addAttributeToList(Attribute attribute,
- ArrayStack<Object> composeStack, Object value, String expression,
+ Deque<Object> composeStack, Object value, String expression,
String body, String role, String type) {
ListAttribute listAttribute = (ListAttribute) ComposeStackUtil
.findAncestorWithClass(composeStack, ListAttribute.class);
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java?rev=912397&r1=912396&r2=912397&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java Sun Feb 21 20:32:31 2010
@@ -22,8 +22,8 @@
package org.apache.tiles.template;
import java.io.IOException;
+import java.util.Deque;
-import org.apache.tiles.ArrayStack;
import org.apache.tiles.ListAttribute;
import org.apache.tiles.autotag.core.runtime.ModelBody;
import org.apache.tiles.request.Request;
@@ -44,7 +44,7 @@
public class AddListAttributeModel {
public void execute(String role, Request request, ModelBody modelBody) throws IOException {
- ArrayStack<Object> composeStack = ComposeStackUtil.getComposeStack(request);
+ Deque<Object> composeStack = ComposeStackUtil.getComposeStack(request);
ListAttribute listAttribute = new ListAttribute();
listAttribute.setRole(role);
composeStack.push(listAttribute);
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/ComposeStackUtil.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/ComposeStackUtil.java?rev=912397&r1=912396&r2=912397&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/ComposeStackUtil.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/ComposeStackUtil.java Sun Feb 21 20:32:31 2010
@@ -21,9 +21,10 @@
package org.apache.tiles.template;
+import java.util.Deque;
+import java.util.LinkedList;
import java.util.Map;
-import org.apache.tiles.ArrayStack;
import org.apache.tiles.request.Request;
/**
@@ -54,16 +55,14 @@
* @return The first ancestor that is assignable to the class, or null if not found.
* @since 2.2.0
*/
- public static Object findAncestorWithClass(ArrayStack<Object> composeStack, Class<?> clazz) {
- Object retValue = null;
- for (int i = composeStack.size() - 1; i >= 0 && retValue == null; i--) {
- Object obj = composeStack.get(i);
+ public static Object findAncestorWithClass(Deque<Object> composeStack, Class<?> clazz) {
+ for (Object obj : composeStack) {
if (clazz.isAssignableFrom(obj.getClass())) {
- retValue = obj;
+ return obj;
}
}
- return retValue;
+ return null;
}
/**
@@ -74,12 +73,12 @@
* @since 2.2.0
*/
@SuppressWarnings("unchecked")
- public static ArrayStack<Object> getComposeStack(Request request) {
+ public static Deque<Object> getComposeStack(Request request) {
Map<String, Object> requestScope = request.getContext("request");
- ArrayStack<Object> composeStack = (ArrayStack<Object>) requestScope
- .get(COMPOSE_STACK_ATTRIBUTE_NAME);
+ Deque<Object> composeStack = (Deque<Object>) requestScope
+ .get(COMPOSE_STACK_ATTRIBUTE_NAME);
if (composeStack == null) {
- composeStack = new ArrayStack<Object>();
+ composeStack = new LinkedList<Object>();
requestScope.put(ComposeStackUtil.COMPOSE_STACK_ATTRIBUTE_NAME, composeStack);
}
return composeStack;
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java?rev=912397&r1=912396&r2=912397&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java Sun Feb 21 20:32:31 2010
@@ -22,8 +22,8 @@
package org.apache.tiles.template;
import java.io.IOException;
+import java.util.Deque;
-import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.Definition;
import org.apache.tiles.access.TilesAccess;
@@ -65,7 +65,7 @@
*/
public void execute(String name, String template, String role,
String extendsParam, String preparer, Request request, ModelBody modelBody) throws IOException {
- ArrayStack<Object> composeStack = ComposeStackUtil
+ Deque<Object> composeStack = ComposeStackUtil
.getComposeStack(request);
Definition definition = createDefinition(name, template, role,
extendsParam, preparer);
@@ -113,7 +113,7 @@
* @param request TODO
*/
private void registerDefinition(Definition definition,
- MutableTilesContainer container, ArrayStack<Object> composeStack,
+ MutableTilesContainer container, Deque<Object> composeStack,
Request request) {
container.register(definition, request);
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java?rev=912397&r1=912396&r2=912397&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java Sun Feb 21 20:32:31 2010
@@ -23,8 +23,8 @@
import java.io.IOException;
import java.io.Writer;
+import java.util.Deque;
-import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
@@ -96,7 +96,7 @@
String role, Object defaultValue, String defaultValueRole, String defaultValueType,
String name, Attribute value, Request request, ModelBody modelBody) throws IOException {
TilesContainer container = TilesAccess.getCurrentContainer(request);
- ArrayStack<Object> composeStack = ComposeStackUtil.getComposeStack(request);
+ Deque<Object> composeStack = ComposeStackUtil.getComposeStack(request);
Attribute attribute = resolveAttribute(container, ignore, preparer,
role, defaultValue, defaultValueRole, defaultValueType, name,
value, request);
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java?rev=912397&r1=912396&r2=912397&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java Sun Feb 21 20:32:31 2010
@@ -22,8 +22,8 @@
package org.apache.tiles.template;
import java.io.IOException;
+import java.util.Deque;
-import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
@@ -108,7 +108,7 @@
String defaultValueType, String name, Attribute value,
Request request, ModelBody modelBody) throws IOException {
TilesContainer container = TilesAccess.getCurrentContainer(request);
- ArrayStack<Object> composeStack = ComposeStackUtil.getComposeStack(request);
+ Deque<Object> composeStack = ComposeStackUtil.getComposeStack(request);
Attribute attribute = resolveAttribute(container, ignore, preparer,
role, defaultValue, defaultValueRole, defaultValueType, name,
value, request);
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java?rev=912397&r1=912396&r2=912397&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java Sun Feb 21 20:32:31 2010
@@ -22,8 +22,8 @@
package org.apache.tiles.template;
import java.io.IOException;
+import java.util.Deque;
-import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.Expression;
@@ -90,7 +90,7 @@
public void execute(String name, Object value,
String expression, String role, String type, boolean cascade,
Request request, ModelBody modelBody) throws IOException {
- ArrayStack<Object> composeStack = ComposeStackUtil.getComposeStack(request);
+ Deque<Object> composeStack = ComposeStackUtil.getComposeStack(request);
Attribute attribute = new Attribute();
composeStack.push(attribute);
String currentBody = modelBody.evaluateAsString();
@@ -120,7 +120,7 @@
* @param request TODO
*/
private void putAttributeInParent(Attribute attribute,
- TilesContainer container, ArrayStack<Object> composeStack, String name,
+ TilesContainer container, Deque<Object> composeStack, String name,
Object value, String expression, String body, String role,
String type, boolean cascade, Request request) {
AttributeContext attributeContext = null;
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java?rev=912397&r1=912396&r2=912397&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java Sun Feb 21 20:32:31 2010
@@ -22,8 +22,8 @@
package org.apache.tiles.template;
import java.io.IOException;
+import java.util.Deque;
-import org.apache.tiles.ArrayStack;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.Definition;
import org.apache.tiles.ListAttribute;
@@ -49,7 +49,7 @@
public void execute(String name, String role, boolean inherit,
boolean cascade, Request request, ModelBody modelBody) throws IOException {
- ArrayStack<Object> composeStack = ComposeStackUtil.getComposeStack(request);
+ Deque<Object> composeStack = ComposeStackUtil.getComposeStack(request);
ListAttribute listAttribute = new ListAttribute();
listAttribute.setRole(role);
listAttribute.setInherit(inherit);
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/AddAttributeModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/AddAttributeModelTest.java?rev=912397&r1=912396&r2=912397&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/AddAttributeModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/AddAttributeModelTest.java Sun Feb 21 20:32:31 2010
@@ -21,15 +21,17 @@
package org.apache.tiles.template;
+import static org.easymock.EasyMock.*;
import static org.easymock.classextension.EasyMock.*;
import static org.junit.Assert.*;
import java.io.IOException;
+import java.util.ArrayDeque;
+import java.util.Deque;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.ListAttribute;
import org.apache.tiles.autotag.core.runtime.ModelBody;
@@ -65,7 +67,7 @@
public void testExecute() throws IOException {
Request request = createMock(Request.class);
ModelBody modelBody = createMock(ModelBody.class);
- ArrayStack<Object> composeStack = new ArrayStack<Object>();
+ Deque<Object> composeStack = new ArrayDeque<Object>();
ListAttribute listAttribute = new ListAttribute();
Attribute attribute;
composeStack.push(listAttribute);
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java?rev=912397&r1=912396&r2=912397&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java Sun Feb 21 20:32:31 2010
@@ -26,10 +26,11 @@
import static org.junit.Assert.*;
import java.io.IOException;
+import java.util.ArrayDeque;
+import java.util.Deque;
import java.util.HashMap;
import java.util.Map;
-import org.apache.tiles.ArrayStack;
import org.apache.tiles.ListAttribute;
import org.apache.tiles.autotag.core.runtime.ModelBody;
import org.apache.tiles.request.Request;
@@ -64,7 +65,7 @@
*/
@Test
public void testExecute() throws IOException {
- ArrayStack<Object> composeStack = new ArrayStack<Object>();
+ Deque<Object> composeStack = new ArrayDeque<Object>();
Request request = createMock(Request.class);
Map<String, Object> requestScope = new HashMap<String, Object>();
ModelBody modelBody = createMock(ModelBody.class);
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/ComposeStackUtilTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/ComposeStackUtilTest.java?rev=912397&r1=912396&r2=912397&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/ComposeStackUtilTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/ComposeStackUtilTest.java Sun Feb 21 20:32:31 2010
@@ -23,7 +23,9 @@
import static org.junit.Assert.*;
-import org.apache.tiles.ArrayStack;
+import java.util.ArrayDeque;
+import java.util.Deque;
+
import org.junit.Test;
/**
@@ -49,7 +51,7 @@
*/
@Test
public void testFindAncestorWithClass() {
- ArrayStack<Object> composeStack = new ArrayStack<Object>();
+ Deque<Object> composeStack = new ArrayDeque<Object>();
Integer integerValue = new Integer(1);
Long longValue = new Long(LONG_VALUE);
String stringValue = "my value";
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/DefinitionModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/DefinitionModelTest.java?rev=912397&r1=912396&r2=912397&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/DefinitionModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/DefinitionModelTest.java Sun Feb 21 20:32:31 2010
@@ -25,10 +25,11 @@
import static org.junit.Assert.*;
import java.io.IOException;
+import java.util.ArrayDeque;
+import java.util.Deque;
import java.util.HashMap;
import java.util.Map;
-import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.Definition;
import org.apache.tiles.access.TilesAccess;
@@ -69,7 +70,7 @@
public void testExecute() throws IOException {
MutableTilesContainer container = createMock(MutableTilesContainer.class);
Request request = createMock(Request.class);
- ArrayStack<Object> composeStack = new ArrayStack<Object>();
+ Deque<Object> composeStack = new ArrayDeque<Object>();
Attribute attribute = new Attribute();
composeStack.push(attribute);
Map<String, Object> requestScope = new HashMap<String, Object>();
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java?rev=912397&r1=912396&r2=912397&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java Sun Feb 21 20:32:31 2010
@@ -26,10 +26,11 @@
import java.io.IOException;
import java.io.Writer;
+import java.util.ArrayDeque;
+import java.util.Deque;
import java.util.HashMap;
import java.util.Map;
-import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.TilesContainer;
@@ -81,7 +82,7 @@
Request request = createMock(Request.class);
Writer writer = createMock(Writer.class);
Map<String, Object> requestScope = new HashMap<String, Object>();
- ArrayStack<Object> composeStack = new ArrayStack<Object>();
+ Deque<Object> composeStack = new ArrayDeque<Object>();
requestScope.put(ComposeStackUtil.COMPOSE_STACK_ATTRIBUTE_NAME, composeStack);
requestScope.put(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
ApplicationContext applicationContext = createMock(ApplicationContext.class);
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/PutAttributeModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/PutAttributeModelTest.java?rev=912397&r1=912396&r2=912397&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/PutAttributeModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/PutAttributeModelTest.java Sun Feb 21 20:32:31 2010
@@ -25,10 +25,11 @@
import static org.easymock.classextension.EasyMock.*;
import java.io.IOException;
+import java.util.ArrayDeque;
+import java.util.Deque;
import java.util.HashMap;
import java.util.Map;
-import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.ListAttribute;
@@ -70,7 +71,7 @@
Request request = createMock(Request.class);
ModelBody modelBody = createMock(ModelBody.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
- ArrayStack<Object> composeStack = new ArrayStack<Object>();
+ Deque<Object> composeStack = new ArrayDeque<Object>();
ListAttribute listAttribute = new ListAttribute();
composeStack.push(listAttribute);
Map<String, Object> requestScope = new HashMap<String, Object>();
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/PutListAttributeModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/PutListAttributeModelTest.java?rev=912397&r1=912396&r2=912397&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/PutListAttributeModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/PutListAttributeModelTest.java Sun Feb 21 20:32:31 2010
@@ -26,10 +26,11 @@
import static org.junit.Assert.*;
import java.io.IOException;
+import java.util.ArrayDeque;
+import java.util.Deque;
import java.util.HashMap;
import java.util.Map;
-import org.apache.tiles.ArrayStack;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.ListAttribute;
import org.apache.tiles.TilesContainer;
@@ -70,7 +71,7 @@
TilesContainer container = createMock(TilesContainer.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
Request request = createMock(Request.class);
- ArrayStack<Object> composeStack = new ArrayStack<Object>();
+ Deque<Object> composeStack = new ArrayDeque<Object>();
Map<String, Object> requestScope = new HashMap<String, Object>();
requestScope.put(ComposeStackUtil.COMPOSE_STACK_ATTRIBUTE_NAME, composeStack);
requestScope.put(TilesAccess.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java?rev=912397&r1=912396&r2=912397&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java Sun Feb 21 20:32:31 2010
@@ -29,7 +29,6 @@
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
-import org.apache.tiles.ArrayStack;
import org.apache.velocity.context.Context;
import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.runtime.Renderable;
@@ -68,13 +67,6 @@
}
/**
- * The attribute key that will be used to store the parameter map, to use across Velocity tool calls.
- *
- * @since 2.2.0
- */
- private static final String PARAMETER_MAP_STACK_KEY = "org.apache.tiles.velocity.PARAMETER_MAP_STACK";
-
- /**
* Private constructor to avoid instantiation.
*/
private VelocityUtil() {
@@ -93,26 +85,6 @@
}
/**
- * Returns or creates the parameter stack to use. It is useful to store parameters across tool calls.
- *
- * @param context The Velocity context.
- * @return The parameter stack.
- * @since 2.2.0
- * @deprecated Use Velocity directives.
- */
- @Deprecated
- @SuppressWarnings("unchecked")
- public static ArrayStack<Map<String, Object>> getParameterStack(Context context) {
- ArrayStack<Map<String, Object>> stack = (ArrayStack<Map<String, Object>>) context
- .get(PARAMETER_MAP_STACK_KEY);
- if (stack == null) {
- stack = new ArrayStack<Map<String, Object>>();
- context.put(PARAMETER_MAP_STACK_KEY, stack);
- }
- return stack;
- }
-
- /**
* Sets an attribute in the desired scope.
*
* @param velocityContext The Velocity context.