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/07/25 15:20:28 UTC
svn commit: r797765 [1/2] - in /tiles/framework/trunk:
tiles-api/src/main/java/org/apache/tiles/
tiles-core/src/main/java/org/apache/tiles/impl/
tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/
tiles-freemarker/src/main/java/org/apac...
Author: apetrelli
Date: Sat Jul 25 13:20:26 2009
New Revision: 797765
URL: http://svn.apache.org/viewvc?rev=797765&view=rev
Log:
TILES-431
Copied and modified ArrayStack from Apache Commons Collections.
Changes references everywhere.
Added:
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/ArrayStack.java (with props)
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddAttributeFMModel.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddListAttributeFMModel.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutAttributeFMModel.java
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutListAttributeFMModel.java
tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerUtilTest.java
tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddAttributeFMModelTest.java
tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddListAttributeFMModelTest.java
tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/DefinitionFMModelTest.java
tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/GetAsStringFMModelTest.java
tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertAttributeFMModelTest.java
tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutAttributeFMModelTest.java
tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutListAttributeFMModelTest.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java
tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/AddAttributeModel.java
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/ComposeStackUtil.java
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java
tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/AddAttributeModelTest.java
tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java
tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/ComposeStackUtilTest.java
tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/DefinitionModelTest.java
tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java
tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/InsertAttributeModelTest.java
tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/PutAttributeModelTest.java
tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/PutListAttributeModelTest.java
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityUtilTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java
Added: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/ArrayStack.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/ArrayStack.java?rev=797765&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/ArrayStack.java (added)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/ArrayStack.java Sat Jul 25 13:20:26 2009
@@ -0,0 +1,176 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tiles;
+
+import java.util.ArrayList;
+import java.util.EmptyStackException;
+
+/**
+ * This class has been copied from Apache Commons Collections 3.2.1 and adapted
+ * to Java 5 generics. Here follows the original comment.<br>
+ *
+ * An implementation of the {@link java.util.Stack} API that is based on an
+ * <code>ArrayList</code> instead of a <code>Vector</code>, so it is not
+ * synchronized to protect against multi-threaded access. The implementation is
+ * therefore operates faster in environments where you do not need to worry
+ * about multiple thread contention.
+ * <p>
+ * The removal order of an <code>ArrayStack</code> is based on insertion order:
+ * The most recently added element is removed first. The iteration order is
+ * <i>not</i> the same as the removal order. The iterator returns elements from
+ * the bottom up, whereas the {@link #remove()} method removes them from the top
+ * down.
+ * <p>
+ * Unlike <code>Stack</code>, <code>ArrayStack</code> accepts null entries.
+ *
+ * @param <T> The type of the element of the stack.
+ * @see java.util.Stack
+ * @since Commons Collections 1.0
+ * @version $Revision$ $Date: 2008-04-10 13:33:15 +0100 (Thu, 10 Apr
+ * 2008) $
+ *
+ * @author Craig R. McClanahan
+ * @author Paul Jack
+ * @author Stephen Colebourne
+ */
+public class ArrayStack<T> extends ArrayList<T> {
+
+ /** Ensure serialization compatibility. */
+ private static final long serialVersionUID = 2130079159931574599L;
+
+ /**
+ * Constructs a new empty <code>ArrayStack</code>. The initial size
+ * is controlled by <code>ArrayList</code> and is currently 10.
+ */
+ public ArrayStack() {
+ super();
+ }
+
+ /**
+ * Constructs a new empty <code>ArrayStack</code> with an initial size.
+ *
+ * @param initialSize the initial size to use
+ * @throws IllegalArgumentException if the specified initial size
+ * is negative
+ */
+ public ArrayStack(int initialSize) {
+ super(initialSize);
+ }
+
+ /**
+ * Return <code>true</code> if this stack is currently empty.
+ * <p>
+ * This method exists for compatibility with <code>java.util.Stack</code>.
+ * New users of this class should use <code>isEmpty</code> instead.
+ *
+ * @return true if the stack is currently empty
+ */
+ public boolean empty() {
+ return isEmpty();
+ }
+
+ /**
+ * Returns the top item off of this stack without removing it.
+ *
+ * @return the top item on the stack
+ * @throws EmptyStackException if the stack is empty
+ */
+ public T peek() {
+ int n = size();
+ if (n <= 0) {
+ throw new EmptyStackException();
+ } else {
+ return get(n - 1);
+ }
+ }
+
+ /**
+ * Returns the n'th item down (zero-relative) from the top of this
+ * stack without removing it.
+ *
+ * @param n the number of items down to go
+ * @return the n'th item on the stack, zero relative
+ * @throws EmptyStackException if there are not enough items on the
+ * stack to satisfy this request
+ */
+ public T peek(int n) {
+ int m = (size() - n) - 1;
+ if (m < 0) {
+ throw new EmptyStackException();
+ } else {
+ return get(m);
+ }
+ }
+
+ /**
+ * Pops the top item off of this stack and return it.
+ *
+ * @return the top item on the stack
+ * @throws EmptyStackException if the stack is empty
+ */
+ public T pop() {
+ int n = size();
+ if (n <= 0) {
+ throw new EmptyStackException();
+ } else {
+ return remove(n - 1);
+ }
+ }
+
+ /**
+ * Pushes a new item onto the top of this stack. The pushed item is also
+ * returned. This is equivalent to calling <code>add</code>.
+ *
+ * @param item the item to be added
+ * @return the item just pushed
+ */
+ public T push(T item) {
+ add(item);
+ return item;
+ }
+
+ /**
+ * Returns the one-based position of the distance from the top that the
+ * specified object exists on this stack, where the top-most element is
+ * considered to be at distance <code>1</code>. If the object is not
+ * present on the stack, return <code>-1</code> instead. The
+ * <code>equals()</code> method is used to compare to the items
+ * in this stack.
+ *
+ * @param object the object to be searched for
+ * @return the 1-based depth into the stack of the object, or -1 if not found
+ */
+ public int search(T object) {
+ int i = size() - 1; // Current index
+ int n = 1; // Current distance
+ while (i >= 0) {
+ Object current = get(i);
+ if ((object == null && current == null)
+ || (object != null && object.equals(current))) {
+ return n;
+ }
+ i--;
+ n++;
+ }
+ return -1;
+ }
+}
Propchange: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/ArrayStack.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/ArrayStack.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java Sat Jul 25 13:20:26 2009
@@ -25,9 +25,9 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.Stack;
import java.util.StringTokenizer;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.BasicAttributeContext;
@@ -462,12 +462,12 @@
* @since 2.0.6
*/
@SuppressWarnings("unchecked")
- protected Stack<AttributeContext> getContextStack(TilesRequestContext tilesContext) {
- Stack<AttributeContext> contextStack =
- (Stack<AttributeContext>) tilesContext
+ protected ArrayStack<AttributeContext> getContextStack(TilesRequestContext tilesContext) {
+ ArrayStack<AttributeContext> contextStack =
+ (ArrayStack<AttributeContext>) tilesContext
.getRequestScope().get(ATTRIBUTE_CONTEXT_STACK);
if (contextStack == null) {
- contextStack = new Stack<AttributeContext>();
+ contextStack = new ArrayStack<AttributeContext>();
tilesContext.getRequestScope().put(ATTRIBUTE_CONTEXT_STACK,
contextStack);
}
@@ -484,7 +484,7 @@
*/
protected void pushContext(AttributeContext context,
TilesRequestContext tilesContext) {
- Stack<AttributeContext> contextStack = getContextStack(tilesContext);
+ ArrayStack<AttributeContext> contextStack = getContextStack(tilesContext);
contextStack.push(context);
}
@@ -496,7 +496,7 @@
* @since 2.0.6
*/
protected AttributeContext popContext(TilesRequestContext tilesContext) {
- Stack<AttributeContext> contextStack = getContextStack(tilesContext);
+ ArrayStack<AttributeContext> contextStack = getContextStack(tilesContext);
return contextStack.pop();
}
@@ -508,7 +508,7 @@
* @since 2.0.6
*/
protected AttributeContext getContext(TilesRequestContext tilesContext) {
- Stack<AttributeContext> contextStack = getContextStack(tilesContext);
+ ArrayStack<AttributeContext> contextStack = getContextStack(tilesContext);
if (!contextStack.isEmpty()) {
return contextStack.peek();
} else {
@@ -550,7 +550,7 @@
*/
private AttributeContext startContext(TilesRequestContext tilesContext) {
AttributeContext context = new BasicAttributeContext();
- Stack<AttributeContext> stack = getContextStack(tilesContext);
+ ArrayStack<AttributeContext> stack = getContextStack(tilesContext);
if (!stack.isEmpty()) {
AttributeContext parent = stack.peek();
context.inheritCascadedAttributes(parent);
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerUtil.java Sat Jul 25 13:20:26 2009
@@ -23,10 +23,10 @@
import java.io.IOException;
import java.io.StringWriter;
-import java.util.Stack;
import javax.servlet.http.HttpServletRequest;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.freemarker.FreeMarkerTilesException;
@@ -275,12 +275,12 @@
* @since 2.2.0
*/
@SuppressWarnings("unchecked")
- public static Stack<Object> getComposeStack(Environment env) {
+ public static ArrayStack<Object> getComposeStack(Environment env) {
HttpServletRequest request = getRequestHashModel(env).getRequest();
- Stack<Object> composeStack = (Stack<Object>) request
+ ArrayStack<Object> composeStack = (ArrayStack<Object>) request
.getAttribute(COMPOSE_STACK_ATTRIBUTE_NAME);
if (composeStack == null) {
- composeStack = new Stack<Object>();
+ composeStack = new ArrayStack<Object>();
request.setAttribute(COMPOSE_STACK_ATTRIBUTE_NAME, composeStack);
}
return composeStack;
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddAttributeFMModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddAttributeFMModel.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddAttributeFMModel.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddAttributeFMModel.java Sat Jul 25 13:20:26 2009
@@ -23,8 +23,8 @@
import java.io.IOException;
import java.util.Map;
-import java.util.Stack;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.freemarker.context.FreeMarkerUtil;
import org.apache.tiles.template.AddAttributeModel;
@@ -36,8 +36,8 @@
/**
* Wraps {@link AddAttributeModel} to be used in FreeMarker. For the list of
- * parameters, see {@link AddAttributeModel#start(Stack)} and
- * {@link AddAttributeModel#end(Stack, Object, String, String, String, String)}.
+ * parameters, see {@link AddAttributeModel#start(ArrayStack)} and
+ * {@link AddAttributeModel#end(ArrayStack, Object, String, String, String, String)}.
*
* @version $Rev$ $Date$
* @since 2.2.0
@@ -63,7 +63,7 @@
@SuppressWarnings("unchecked")
public void execute(Environment env, Map params, TemplateModel[] loopVars,
TemplateDirectiveBody body) throws TemplateException, IOException {
- Stack<Object> composeStack = FreeMarkerUtil.getComposeStack(env);
+ ArrayStack<Object> composeStack = FreeMarkerUtil.getComposeStack(env);
model.start(composeStack);
String bodyString = FreeMarkerUtil.renderAsString(body);
Map<String, TemplateModel> parms = (Map<String, TemplateModel>) params;
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddListAttributeFMModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddListAttributeFMModel.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddListAttributeFMModel.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/AddListAttributeFMModel.java Sat Jul 25 13:20:26 2009
@@ -23,8 +23,8 @@
import java.io.IOException;
import java.util.Map;
-import java.util.Stack;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.freemarker.context.FreeMarkerUtil;
import org.apache.tiles.template.AddListAttributeModel;
@@ -36,8 +36,8 @@
/**
* Wraps {@link AddListAttributeModel} to be used in FreeMarker. For the list of
- * parameters, see {@link AddListAttributeModel#start(Stack, String)} and
- * {@link AddListAttributeModel#end(Stack)}.
+ * parameters, see {@link AddListAttributeModel#start(ArrayStack, String)} and
+ * {@link AddListAttributeModel#end(ArrayStack)}.
*
* @version $Rev$ $Date$
* @since 2.2.0
@@ -64,7 +64,7 @@
public void execute(Environment env, Map params, TemplateModel[] loopVars,
TemplateDirectiveBody body) throws TemplateException, IOException {
Map<String, TemplateModel> parms = (Map<String, TemplateModel>) params;
- Stack<Object> composeStack = FreeMarkerUtil.getComposeStack(env);
+ ArrayStack<Object> composeStack = FreeMarkerUtil.getComposeStack(env);
model.start(composeStack, FreeMarkerUtil.getAsString(parms.get("role")));
FreeMarkerUtil.evaluateBody(body);
model.end(composeStack);
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutAttributeFMModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutAttributeFMModel.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutAttributeFMModel.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutAttributeFMModel.java Sat Jul 25 13:20:26 2009
@@ -23,8 +23,8 @@
import java.io.IOException;
import java.util.Map;
-import java.util.Stack;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.freemarker.context.FreeMarkerUtil;
import org.apache.tiles.template.PutAttributeModel;
@@ -36,12 +36,9 @@
/**
* Wraps {@link PutAttributeModel} to be used in FreeMarker. For the list of
- * parameters, see
- * {@link PutAttributeModel#start(Stack)}
- * and
- * {@link PutAttributeModel
- * #end(org.apache.tiles.TilesContainer, Stack, String, Object, String, String, String, String, boolean, Object...)}
- * .
+ * parameters, see {@link PutAttributeModel#start(ArrayStack)} and
+ * {@link PutAttributeModel #end(org.apache.tiles.TilesContainer, ArrayStack,
+ * String, Object, String, String, String, String, boolean, Object...)}.
*
* @version $Rev$ $Date$
* @since 2.2.0
@@ -67,7 +64,7 @@
@SuppressWarnings("unchecked")
public void execute(Environment env, Map params, TemplateModel[] loopVars,
TemplateDirectiveBody body) throws TemplateException, IOException {
- Stack<Object> composeStack = FreeMarkerUtil.getComposeStack(env);
+ ArrayStack<Object> composeStack = FreeMarkerUtil.getComposeStack(env);
model.start(composeStack);
String bodyString = FreeMarkerUtil.renderAsString(body);
Map<String, TemplateModel> parms = (Map<String, TemplateModel>) params;
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutListAttributeFMModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutListAttributeFMModel.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutListAttributeFMModel.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/template/PutListAttributeFMModel.java Sat Jul 25 13:20:26 2009
@@ -23,8 +23,8 @@
import java.io.IOException;
import java.util.Map;
-import java.util.Stack;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.freemarker.context.FreeMarkerUtil;
import org.apache.tiles.template.PutListAttributeModel;
@@ -37,9 +37,9 @@
/**
* Wraps {@link PutListAttributeModel} to be used in FreeMarker. For the list of
* parameters, see
- * {@link PutListAttributeModel#start(Stack, String, boolean)}
+ * {@link PutListAttributeModel#start(ArrayStack, String, boolean)}
* and
- * {@link PutListAttributeModel#end(org.apache.tiles.TilesContainer, Stack, String, boolean, Object...)}
+ * {@link PutListAttributeModel#end(org.apache.tiles.TilesContainer, ArrayStack, String, boolean, Object...)}
* .
*
* @version $Rev$ $Date$
@@ -67,7 +67,7 @@
public void execute(Environment env, Map params, TemplateModel[] loopVars,
TemplateDirectiveBody body) throws TemplateException, IOException {
Map<String, TemplateModel> parms = (Map<String, TemplateModel>) params;
- Stack<Object> composeStack = FreeMarkerUtil.getComposeStack(env);
+ ArrayStack<Object> composeStack = FreeMarkerUtil.getComposeStack(env);
model.start(composeStack, FreeMarkerUtil.getAsString(parms.get("role")),
FreeMarkerUtil.getAsBoolean(parms.get("inherit"), false));
FreeMarkerUtil.evaluateBody(body);
Modified: tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerUtilTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerUtilTest.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerUtilTest.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/context/FreeMarkerUtilTest.java Sat Jul 25 13:20:26 2009
@@ -29,13 +29,13 @@
import java.io.StringWriter;
import java.util.HashMap;
import java.util.Locale;
-import java.util.Stack;
import javax.servlet.GenericServlet;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.freemarker.io.NullWriter;
import org.apache.tiles.impl.NoSuchContainerException;
@@ -454,8 +454,9 @@
expect(model.get("Request")).andReturn(requestModel).times(2);
expect(request.getAttribute(COMPOSE_STACK_ATTRIBUTE_NAME)).andReturn(null);
- request.setAttribute(eq(COMPOSE_STACK_ATTRIBUTE_NAME), isA(Stack.class));
- Stack<Object> myStack = new Stack<Object>();
+ request.setAttribute(eq(COMPOSE_STACK_ATTRIBUTE_NAME),
+ isA(ArrayStack.class));
+ ArrayStack<Object> myStack = new ArrayStack<Object>();
expect(request.getAttribute(COMPOSE_STACK_ATTRIBUTE_NAME)).andReturn(myStack);
replay(template, model, wrappedObj, request);
Modified: tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddAttributeFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddAttributeFMModelTest.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddAttributeFMModelTest.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddAttributeFMModelTest.java Sat Jul 25 13:20:26 2009
@@ -21,7 +21,7 @@
package org.apache.tiles.freemarker.template;
-import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.*;
import static org.easymock.classextension.EasyMock.*;
import java.io.IOException;
@@ -29,10 +29,10 @@
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import java.util.Stack;
import javax.servlet.http.HttpServletRequest;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.freemarker.context.FreeMarkerUtil;
import org.apache.tiles.template.AddAttributeModel;
import org.junit.Before;
@@ -115,7 +115,7 @@
initEnvironment();
TemplateDirectiveBody body = createMock(TemplateDirectiveBody.class);
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
Map<String, Object> params = new HashMap<String, Object>();
Integer value = new Integer(1);
params.put("value", objectWrapper.wrap(value));
Modified: tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddListAttributeFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddListAttributeFMModelTest.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddListAttributeFMModelTest.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/AddListAttributeFMModelTest.java Sat Jul 25 13:20:26 2009
@@ -21,6 +21,7 @@
package org.apache.tiles.freemarker.template;
+import static org.easymock.EasyMock.*;
import static org.easymock.classextension.EasyMock.*;
import java.io.IOException;
@@ -28,10 +29,10 @@
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import java.util.Stack;
import javax.servlet.http.HttpServletRequest;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.freemarker.context.FreeMarkerUtil;
import org.apache.tiles.freemarker.io.NullWriter;
import org.apache.tiles.template.AddListAttributeModel;
@@ -115,7 +116,7 @@
initEnvironment();
TemplateDirectiveBody body = createMock(TemplateDirectiveBody.class);
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
Map<String, Object> params = new HashMap<String, Object>();
params.put("role", objectWrapper.wrap("myRole"));
Modified: tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/DefinitionFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/DefinitionFMModelTest.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/DefinitionFMModelTest.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/DefinitionFMModelTest.java Sat Jul 25 13:20:26 2009
@@ -21,6 +21,7 @@
package org.apache.tiles.freemarker.template;
+import static org.easymock.EasyMock.*;
import static org.easymock.classextension.EasyMock.*;
import java.io.IOException;
@@ -28,12 +29,12 @@
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import java.util.Stack;
import javax.servlet.GenericServlet;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.freemarker.context.FreeMarkerUtil;
import org.apache.tiles.freemarker.io.NullWriter;
@@ -122,7 +123,7 @@
MutableTilesContainer container = createMock(MutableTilesContainer.class);
HttpServletRequest request = createMock(HttpServletRequest.class);
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
expect(request.getAttribute(FreeMarkerUtil.COMPOSE_STACK_ATTRIBUTE_NAME)).andReturn(composeStack).times(2);
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
Modified: tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/GetAsStringFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/GetAsStringFMModelTest.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/GetAsStringFMModelTest.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/GetAsStringFMModelTest.java Sat Jul 25 13:20:26 2009
@@ -21,6 +21,7 @@
package org.apache.tiles.freemarker.template;
+import static org.easymock.EasyMock.*;
import static org.easymock.classextension.EasyMock.*;
import java.io.IOException;
@@ -28,12 +29,12 @@
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import java.util.Stack;
import javax.servlet.GenericServlet;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
@@ -123,7 +124,7 @@
TilesContainer container = createMock(TilesContainer.class);
HttpServletRequest request = createMock(HttpServletRequest.class);
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
expect(request.getAttribute(FreeMarkerUtil.COMPOSE_STACK_ATTRIBUTE_NAME)).andReturn(composeStack).times(2);
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
Modified: tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertAttributeFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertAttributeFMModelTest.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertAttributeFMModelTest.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/InsertAttributeFMModelTest.java Sat Jul 25 13:20:26 2009
@@ -21,6 +21,7 @@
package org.apache.tiles.freemarker.template;
+import static org.easymock.EasyMock.*;
import static org.easymock.classextension.EasyMock.*;
import java.io.IOException;
@@ -28,12 +29,12 @@
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import java.util.Stack;
import javax.servlet.GenericServlet;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
@@ -123,7 +124,7 @@
TilesContainer container = createMock(TilesContainer.class);
HttpServletRequest request = createMock(HttpServletRequest.class);
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
expect(request.getAttribute(FreeMarkerUtil.COMPOSE_STACK_ATTRIBUTE_NAME)).andReturn(composeStack).times(2);
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
Modified: tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutAttributeFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutAttributeFMModelTest.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutAttributeFMModelTest.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutAttributeFMModelTest.java Sat Jul 25 13:20:26 2009
@@ -21,7 +21,7 @@
package org.apache.tiles.freemarker.template;
-import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.*;
import static org.easymock.classextension.EasyMock.*;
import java.io.IOException;
@@ -29,12 +29,12 @@
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import java.util.Stack;
import javax.servlet.GenericServlet;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.freemarker.context.FreeMarkerUtil;
@@ -117,7 +117,7 @@
PutAttributeFMModel fmModel = new PutAttributeFMModel(tModel);
HttpServletRequest request = createMock(HttpServletRequest.class);
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
expect(request.getAttribute(FreeMarkerUtil.COMPOSE_STACK_ATTRIBUTE_NAME)).andReturn(composeStack);
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
Modified: tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutListAttributeFMModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutListAttributeFMModelTest.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutListAttributeFMModelTest.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/template/PutListAttributeFMModelTest.java Sat Jul 25 13:20:26 2009
@@ -21,6 +21,7 @@
package org.apache.tiles.freemarker.template;
+import static org.easymock.EasyMock.*;
import static org.easymock.classextension.EasyMock.*;
import java.io.IOException;
@@ -28,12 +29,12 @@
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import java.util.Stack;
import javax.servlet.GenericServlet;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.freemarker.context.FreeMarkerUtil;
@@ -117,7 +118,7 @@
PutListAttributeFMModel fmModel = new PutListAttributeFMModel(tModel);
HttpServletRequest request = createMock(HttpServletRequest.class);
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
expect(request.getAttribute(FreeMarkerUtil.COMPOSE_STACK_ATTRIBUTE_NAME)).andReturn(composeStack);
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(null);
request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, container);
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java Sat Jul 25 13:20:26 2009
@@ -25,13 +25,13 @@
import java.io.StringWriter;
import java.util.HashMap;
import java.util.Map;
-import java.util.Stack;
import javax.servlet.jsp.JspContext;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.JspFragment;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.impl.NoSuchContainerException;
@@ -231,11 +231,11 @@
* @since 2.2.0
*/
@SuppressWarnings("unchecked")
- public static Stack<Object> getComposeStack(JspContext context) {
- Stack<Object> composeStack = (Stack<Object>) context.getAttribute(
+ public static ArrayStack<Object> getComposeStack(JspContext context) {
+ ArrayStack<Object> composeStack = (ArrayStack<Object>) context.getAttribute(
COMPOSE_STACK_ATTRIBUTE_NAME, PageContext.REQUEST_SCOPE);
if (composeStack == null) {
- composeStack = new Stack<Object>();
+ composeStack = new ArrayStack<Object>();
context.setAttribute(COMPOSE_STACK_ATTRIBUTE_NAME, composeStack,
PageContext.REQUEST_SCOPE);
}
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java Sat Jul 25 13:20:26 2009
@@ -28,13 +28,13 @@
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Set;
-import java.util.Stack;
import javax.servlet.RequestDispatcher;
import javax.servlet.Servlet;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.BasicAttributeContext;
import org.apache.tiles.TilesApplicationContext;
@@ -123,7 +123,7 @@
/** {@inheritDoc} */
public int doStartTag() {
- Stack<Object> composeStack = JspUtil.getComposeStack(pageContext);
+ ArrayStack<Object> composeStack = JspUtil.getComposeStack(pageContext);
composeStack.push(new BasicAttributeContext());
return EVAL_BODY_INCLUDE;
}
@@ -131,7 +131,7 @@
/** {@inheritDoc} */
// TODO Add a MutableContainer so that this can be done?
public int doEndTag() {
- Stack<Object> composeStack = JspUtil.getComposeStack(pageContext);
+ ArrayStack<Object> composeStack = JspUtil.getComposeStack(pageContext);
AttributeContext attributeContext = (AttributeContext) composeStack.pop();
TilesContainer container =
Modified: tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java Sat Jul 25 13:20:26 2009
@@ -21,13 +21,12 @@
package org.apache.tiles.jsp.context;
-import java.util.Stack;
-
import javax.servlet.ServletContext;
import javax.servlet.jsp.PageContext;
import junit.framework.TestCase;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.jsp.taglib.TilesJspException;
@@ -185,7 +184,7 @@
public void testGetComposeStack() {
PageContext pageContext = EasyMock.createMock(PageContext.class);
- Stack<Object> stack = new Stack<Object>();
+ ArrayStack<Object> stack = new ArrayStack<Object>();
EasyMock.expect(
pageContext.getAttribute(
@@ -197,7 +196,7 @@
PageContext.REQUEST_SCOPE)).andReturn(stack);
pageContext.setAttribute(EasyMock
.eq("org.apache.tiles.template.COMPOSE_STACK"), EasyMock
- .isA(Stack.class), EasyMock.eq(PageContext.REQUEST_SCOPE));
+ .isA(ArrayStack.class), EasyMock.eq(PageContext.REQUEST_SCOPE));
EasyMock.replay(pageContext);
assertTrue(JspUtil.getComposeStack(pageContext).isEmpty());
Modified: tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java (original)
+++ tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java Sat Jul 25 13:20:26 2009
@@ -22,13 +22,13 @@
package org.apache.tiles.servlet.context;
import java.io.IOException;
-import java.util.Stack;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
@@ -255,11 +255,11 @@
* @since 2.2.0
*/
@SuppressWarnings("unchecked")
- public static Stack<Object> getComposeStack(HttpServletRequest request) {
- Stack<Object> composeStack = (Stack<Object>) request.getAttribute(
+ public static ArrayStack<Object> getComposeStack(HttpServletRequest request) {
+ ArrayStack<Object> composeStack = (ArrayStack<Object>) request.getAttribute(
COMPOSE_STACK_ATTRIBUTE_NAME);
if (composeStack == null) {
- composeStack = new Stack<Object>();
+ composeStack = new ArrayStack<Object>();
request.setAttribute(COMPOSE_STACK_ATTRIBUTE_NAME, composeStack);
}
return composeStack;
Modified: tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/AddAttributeModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/AddAttributeModel.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/AddAttributeModel.java (original)
+++ tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/AddAttributeModel.java Sat Jul 25 13:20:26 2009
@@ -21,8 +21,7 @@
package org.apache.tiles.template;
-import java.util.Stack;
-
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.Expression;
import org.apache.tiles.ListAttribute;
@@ -50,7 +49,7 @@
* @param composeStack The composing stack.
* @since 2.2.0
*/
- public void start(Stack<Object> composeStack) {
+ public void start(ArrayStack<Object> composeStack) {
Attribute attribute = new Attribute();
composeStack.push(attribute);
}
@@ -70,7 +69,7 @@
* @param type The type (renderer) of the attribute.
* @since 2.2.0
*/
- public void end(Stack<Object> composeStack, Object value,
+ public void end(ArrayStack<Object> composeStack, Object value,
String expression, String body, String role, String type) {
Attribute attribute = (Attribute) composeStack.pop();
addAttributeToList(attribute, composeStack, value, expression, body,
@@ -92,7 +91,7 @@
* @param type The type (renderer) of the attribute.
* @since 2.2.0
*/
- public void execute(Stack<Object> composeStack, Object value,
+ public void execute(ArrayStack<Object> composeStack, Object value,
String expression, String body, String role, String type) {
addAttributeToList(new Attribute(), composeStack, value, expression,
body, role, type);
@@ -115,7 +114,7 @@
* @since 2.2.0
*/
private void addAttributeToList(Attribute attribute,
- Stack<Object> composeStack, Object value, String expression,
+ ArrayStack<Object> composeStack, Object value, String expression,
String body, String role, String type) {
ListAttribute listAttribute = (ListAttribute) ComposeStackUtil
.findAncestorWithClass(composeStack, ListAttribute.class);
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=797765&r1=797764&r2=797765&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 Sat Jul 25 13:20:26 2009
@@ -21,8 +21,7 @@
package org.apache.tiles.template;
-import java.util.Stack;
-
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.ListAttribute;
/**
@@ -48,7 +47,7 @@
* will be rendered only if the current user belongs to one of the roles.
* @since 2.2.0
*/
- public void start(Stack<Object> composeStack, String role) {
+ public void start(ArrayStack<Object> composeStack, String role) {
ListAttribute listAttribute = new ListAttribute();
listAttribute.setRole(role);
composeStack.push(listAttribute);
@@ -60,7 +59,7 @@
* @param composeStack The composing stack.
* @since 2.2.0
*/
- public void end(Stack<Object> composeStack) {
+ public void end(ArrayStack<Object> composeStack) {
ListAttribute listAttribute = (ListAttribute) composeStack.pop();
ListAttribute parent = (ListAttribute) composeStack.peek();
parent.add(listAttribute);
Modified: tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/ComposeStackUtil.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/ComposeStackUtil.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/ComposeStackUtil.java (original)
+++ tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/ComposeStackUtil.java Sat Jul 25 13:20:26 2009
@@ -21,7 +21,7 @@
package org.apache.tiles.template;
-import java.util.Stack;
+import org.apache.tiles.ArrayStack;
/**
* Utilities to work with compose stacks.
@@ -46,7 +46,7 @@
* @return The first ancestor that is assignable to the class, or null if not found.
* @since 2.2.0
*/
- public static Object findAncestorWithClass(Stack<Object> composeStack, Class<?> clazz) {
+ 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);
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=797765&r1=797764&r2=797765&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 Sat Jul 25 13:20:26 2009
@@ -21,8 +21,7 @@
package org.apache.tiles.template;
-import java.util.Stack;
-
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.Definition;
import org.apache.tiles.mgmt.MutableTilesContainer;
@@ -53,7 +52,7 @@
* @param preparer The preparer to use to invoke before the definition is rendered.
* @since 2.2.0
*/
- public void start(Stack<Object> composeStack, String name, String template,
+ public void start(ArrayStack<Object> composeStack, String name, String template,
String role, String extendsParam, String preparer) {
Definition definition = createDefinition(name, template, role,
extendsParam, preparer);
@@ -69,7 +68,7 @@
* @since 2.2.0
*/
public void end(MutableTilesContainer container,
- Stack<Object> composeStack, Object... requestItems) {
+ ArrayStack<Object> composeStack, Object... requestItems) {
Definition definition = (Definition) composeStack.pop();
registerDefinition(definition, container, composeStack, requestItems);
}
@@ -89,7 +88,7 @@
* @since 2.2.0
*/
public void execute(MutableTilesContainer container,
- Stack<Object> composeStack, String name, String template,
+ ArrayStack<Object> composeStack, String name, String template,
String role, String extendsParam, String preparer,
Object... requestItems) {
Definition definition = createDefinition(name, template, role,
@@ -130,7 +129,7 @@
* @param requestItems The request object.
*/
private void registerDefinition(Definition definition,
- MutableTilesContainer container, Stack<Object> composeStack,
+ MutableTilesContainer container, ArrayStack<Object> composeStack,
Object... requestItems) {
container.register(definition, requestItems);
Modified: tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java (original)
+++ tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java Sat Jul 25 13:20:26 2009
@@ -23,8 +23,8 @@
import java.io.IOException;
import java.io.Writer;
-import java.util.Stack;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesContainer;
import org.slf4j.Logger;
@@ -88,7 +88,7 @@
* @param requestItems The request objects.
* @since 2.2.0
*/
- public void start(Stack<Object> composeStack, TilesContainer container,
+ public void start(ArrayStack<Object> composeStack, TilesContainer container,
boolean ignore, String preparer, String role, Object defaultValue,
String defaultValueRole, String defaultValueType, String name,
Attribute value, Object... requestItems) {
@@ -109,7 +109,7 @@
* @param requestItems The request objects.
* @throws IOException If an I/O error happens during rendering.
*/
- public void end(Stack<Object> composeStack, TilesContainer container,
+ public void end(ArrayStack<Object> composeStack, TilesContainer container,
Writer writer, boolean ignore, Object... requestItems)
throws IOException {
Attribute attribute = (Attribute) composeStack.pop();
Modified: tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java (original)
+++ tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java Sat Jul 25 13:20:26 2009
@@ -22,8 +22,8 @@
package org.apache.tiles.template;
import java.io.IOException;
-import java.util.Stack;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesContainer;
import org.slf4j.Logger;
@@ -100,7 +100,7 @@
* @param requestItems The request objects.
* @since 2.2.0
*/
- public void start(Stack<Object> composeStack, TilesContainer container,
+ public void start(ArrayStack<Object> composeStack, TilesContainer container,
boolean ignore, String preparer, String role, Object defaultValue,
String defaultValueRole, String defaultValueType, String name,
Attribute value, Object... requestItems) {
@@ -120,7 +120,7 @@
* @param requestItems The request objects.
* @throws IOException If an I/O error happens during rendering.
*/
- public void end(Stack<Object> composeStack, TilesContainer container,
+ public void end(ArrayStack<Object> composeStack, TilesContainer container,
boolean ignore, Object... requestItems) throws IOException {
Attribute attribute = (Attribute) composeStack.pop();
renderAttribute(container, ignore, attribute, requestItems);
Modified: tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java (original)
+++ tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java Sat Jul 25 13:20:26 2009
@@ -21,8 +21,7 @@
package org.apache.tiles.template;
-import java.util.Stack;
-
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.Expression;
@@ -72,7 +71,7 @@
* @param composeStack The compose stack.
* @since 2.2.0
*/
- public void start(Stack<Object> composeStack) {
+ public void start(ArrayStack<Object> composeStack) {
Attribute attribute = new Attribute();
composeStack.push(attribute);
}
@@ -96,7 +95,7 @@
* @param requestItems The request objects.
* @since 2.2.0
*/
- public void end(TilesContainer container, Stack<Object> composeStack,
+ public void end(TilesContainer container, ArrayStack<Object> composeStack,
String name, Object value, String expression, String body,
String role, String type, boolean cascade, Object... requestItems) {
Attribute attribute = (Attribute) composeStack.pop();
@@ -123,7 +122,7 @@
* @param requestItems The request objects.
* @since 2.2.0
*/
- public void execute(TilesContainer container, Stack<Object> composeStack,
+ public void execute(TilesContainer container, ArrayStack<Object> composeStack,
String name, Object value, String expression, String body,
String role, String type, boolean cascade, Object... requestItems) {
putAttributeInParent(new Attribute(), container, composeStack, name,
@@ -150,7 +149,7 @@
* @param requestItems The request objects.
*/
private void putAttributeInParent(Attribute attribute,
- TilesContainer container, Stack<Object> composeStack, String name,
+ TilesContainer container, ArrayStack<Object> composeStack, String name,
Object value, String expression, String body, String role,
String type, boolean cascade, Object... requestItems) {
AttributeContext attributeContext = null;
Modified: tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java (original)
+++ tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java Sat Jul 25 13:20:26 2009
@@ -21,8 +21,7 @@
package org.apache.tiles.template;
-import java.util.Stack;
-
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.Definition;
import org.apache.tiles.ListAttribute;
@@ -53,7 +52,7 @@
* attribute of the parent definition will be extended.
* @since 2.2.0
*/
- public void start(Stack<Object> composeStack, String role, boolean inherit) {
+ public void start(ArrayStack<Object> composeStack, String role, boolean inherit) {
ListAttribute listAttribute = new ListAttribute();
listAttribute.setRole(role);
listAttribute.setInherit(inherit);
@@ -70,7 +69,7 @@
* @param requestItems The request objects.
* @since 2.2.0
*/
- public void end(TilesContainer container, Stack<Object> composeStack,
+ public void end(TilesContainer container, ArrayStack<Object> composeStack,
String name, boolean cascade, Object... requestItems) {
ListAttribute listAttribute = (ListAttribute) composeStack.pop();
AttributeContext attributeContext = null;
Modified: tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/AddAttributeModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/AddAttributeModelTest.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/AddAttributeModelTest.java (original)
+++ tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/AddAttributeModelTest.java Sat Jul 25 13:20:26 2009
@@ -25,8 +25,8 @@
import static org.junit.Assert.*;
import java.util.List;
-import java.util.Stack;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.ListAttribute;
import org.junit.Before;
@@ -56,7 +56,7 @@
@SuppressWarnings("unchecked")
@Test
public void testStart() {
- Stack<Object> composeStack = createMock(Stack.class);
+ ArrayStack<Object> composeStack = createMock(ArrayStack.class);
Attribute attribute = new Attribute();
expect(composeStack.push(isA(Attribute.class))).andReturn(attribute);
@@ -75,7 +75,7 @@
@SuppressWarnings("unchecked")
@Test
public void testEnd() {
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
ListAttribute listAttribute = new ListAttribute();
Attribute attribute = new Attribute();
composeStack.push(listAttribute);
@@ -90,7 +90,7 @@
assertEquals("myRole", attribute.getRole());
assertEquals("myType", attribute.getRenderer());
- composeStack = new Stack<Object>();
+ composeStack = new ArrayStack<Object>();
listAttribute = new ListAttribute();
attribute = new Attribute();
composeStack.push(listAttribute);
@@ -114,7 +114,7 @@
@SuppressWarnings("unchecked")
@Test
public void testExecute() {
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
ListAttribute listAttribute = new ListAttribute();
Attribute attribute;
composeStack.push(listAttribute);
@@ -129,7 +129,7 @@
assertEquals("myRole", attribute.getRole());
assertEquals("myType", attribute.getRenderer());
- composeStack = new Stack<Object>();
+ composeStack = new ArrayStack<Object>();
listAttribute = new ListAttribute();
attribute = new Attribute();
composeStack.push(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=797765&r1=797764&r2=797765&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 Sat Jul 25 13:20:26 2009
@@ -24,8 +24,8 @@
import static org.junit.Assert.*;
import java.util.List;
-import java.util.Stack;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.ListAttribute;
import org.junit.Before;
@@ -56,7 +56,7 @@
*/
@Test
public void testStart() {
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
model.start(composeStack, "myRole");
assertEquals(1, composeStack.size());
ListAttribute listAttribute = (ListAttribute) composeStack.peek();
@@ -69,7 +69,7 @@
@SuppressWarnings("unchecked")
@Test
public void testEnd() {
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
ListAttribute listAttribute = new ListAttribute();
ListAttribute parent = new ListAttribute();
composeStack.push(parent);
Modified: tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/ComposeStackUtilTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/ComposeStackUtilTest.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/ComposeStackUtilTest.java (original)
+++ tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/ComposeStackUtilTest.java Sat Jul 25 13:20:26 2009
@@ -23,8 +23,7 @@
import static org.junit.Assert.*;
-import java.util.Stack;
-
+import org.apache.tiles.ArrayStack;
import org.junit.Test;
/**
@@ -50,7 +49,7 @@
*/
@Test
public void testFindAncestorWithClass() {
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
Integer integerValue = new Integer(1);
Long longValue = new Long(LONG_VALUE);
String stringValue = "my value";
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=797765&r1=797764&r2=797765&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 Sat Jul 25 13:20:26 2009
@@ -21,11 +21,10 @@
package org.apache.tiles.template;
-import static org.junit.Assert.*;
import static org.easymock.EasyMock.*;
+import static org.junit.Assert.*;
-import java.util.Stack;
-
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.Definition;
import org.apache.tiles.mgmt.MutableTilesContainer;
@@ -59,7 +58,7 @@
*/
@Test
public void testStart() {
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
model.start(composeStack, "myName", "myTemplate", "myRole", "myExtends", "myPreparer");
assertEquals(1, composeStack.size());
Definition definition = (Definition) composeStack.peek();
@@ -76,7 +75,7 @@
@Test
public void testEnd() {
MutableTilesContainer container = createMock(MutableTilesContainer.class);
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
Definition definition = new Definition();
composeStack.push(definition);
Integer requestItem = new Integer(1);
@@ -95,7 +94,7 @@
@Test
public void testEndInAttribute() {
MutableTilesContainer container = createMock(MutableTilesContainer.class);
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
Attribute attribute = new Attribute();
composeStack.push(attribute);
Definition definition = new Definition();
@@ -121,7 +120,7 @@
@Test
public void testExecute() {
MutableTilesContainer container = createMock(MutableTilesContainer.class);
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
Attribute attribute = new Attribute();
composeStack.push(attribute);
Integer requestItem = new Integer(1);
Modified: tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java (original)
+++ tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java Sat Jul 25 13:20:26 2009
@@ -21,13 +21,14 @@
package org.apache.tiles.template;
-import static org.junit.Assert.*;
+import static org.easymock.EasyMock.*;
import static org.easymock.classextension.EasyMock.*;
+import static org.junit.Assert.*;
import java.io.IOException;
import java.io.Writer;
-import java.util.Stack;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.TilesContainer;
@@ -68,7 +69,7 @@
*/
@Test
public void testStart() {
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
TilesContainer container = createMock(TilesContainer.class);
Integer requestItem = new Integer(1);
Attribute attribute = new Attribute();
@@ -95,7 +96,7 @@
*/
@Test
public void testEnd() throws IOException {
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
Attribute attribute = new Attribute("myValue");
composeStack.push(attribute);
TilesContainer container = createMock(TilesContainer.class);
Modified: tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/InsertAttributeModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/InsertAttributeModelTest.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/InsertAttributeModelTest.java (original)
+++ tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/InsertAttributeModelTest.java Sat Jul 25 13:20:26 2009
@@ -21,12 +21,12 @@
package org.apache.tiles.template;
-import static org.junit.Assert.*;
import static org.easymock.EasyMock.*;
+import static org.junit.Assert.*;
import java.io.IOException;
-import java.util.Stack;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.TilesContainer;
@@ -61,12 +61,12 @@
/**
* Test method for {@link org.apache.tiles.template.InsertAttributeModel
- * #start(Stack, TilesContainer, boolean, String, String, Object, String,
+ * #start(ArrayStack, TilesContainer, boolean, String, String, Object, String,
* String, String, Attribute, Object...)}.
*/
@Test
public void testStart() {
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
TilesContainer container = createMock(TilesContainer.class);
Integer requestItem = new Integer(1);
Attribute attribute = new Attribute();
@@ -87,12 +87,12 @@
/**
* Test method for {@link org.apache.tiles.template.InsertAttributeModel
- * #end(Stack, TilesContainer, boolean, Object...)}.
+ * #end(ArrayStack, TilesContainer, boolean, Object...)}.
* @throws IOException If something goes wrong.
*/
@Test
public void testEnd() throws IOException {
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
Attribute attribute = new Attribute("myValue");
composeStack.push(attribute);
TilesContainer container = createMock(TilesContainer.class);
Modified: tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/PutAttributeModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/PutAttributeModelTest.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/PutAttributeModelTest.java (original)
+++ tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/PutAttributeModelTest.java Sat Jul 25 13:20:26 2009
@@ -21,11 +21,11 @@
package org.apache.tiles.template;
+import static org.easymock.EasyMock.*;
import static org.easymock.classextension.EasyMock.*;
import static org.junit.Assert.*;
-import java.util.Stack;
-
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.ListAttribute;
@@ -52,12 +52,12 @@
}
/**
- * Test method for {@link org.apache.tiles.template.PutAttributeModel#start(Stack)}.
+ * Test method for {@link org.apache.tiles.template.PutAttributeModel#start(ArrayStack)}.
*/
@SuppressWarnings("unchecked")
@Test
public void testStart() {
- Stack<Object> composeStack = createMock(Stack.class);
+ ArrayStack<Object> composeStack = createMock(ArrayStack.class);
Attribute attribute = new Attribute();
expect(composeStack.push(isA(Attribute.class))).andReturn(attribute);
@@ -69,14 +69,14 @@
/**
* Test method for {@link org.apache.tiles.template.PutAttributeModel
- * #end(org.apache.tiles.TilesContainer, Stack, String, Object, String,
+ * #end(org.apache.tiles.TilesContainer, ArrayStack, String, Object, String,
* String, String, String, boolean, Object...)}.
*/
@Test
public void testEnd() {
TilesContainer container = createMock(TilesContainer.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
Attribute attribute = new Attribute();
Integer requestItem = new Integer(1);
composeStack.push(attribute);
@@ -97,14 +97,14 @@
/**
* Test method for {@link org.apache.tiles.template.PutAttributeModel
- * #end(org.apache.tiles.TilesContainer, Stack, String, Object, String,
+ * #end(org.apache.tiles.TilesContainer, ArrayStack, String, Object, String,
* String, String, String, boolean, Object...)}.
*/
@Test
public void testEndBody() {
TilesContainer container = createMock(TilesContainer.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
Attribute attribute = new Attribute();
Integer requestItem = new Integer(1);
composeStack.push(attribute);
@@ -125,14 +125,14 @@
/**
* Test method for {@link org.apache.tiles.template.PutAttributeModel
- * #execute(org.apache.tiles.TilesContainer, Stack, String, Object, String,
+ * #execute(org.apache.tiles.TilesContainer, ArrayStack, String, Object, String,
* String, String, String, boolean, Object...)}.
*/
@Test
public void testExecuteListAttribute() {
TilesContainer container = createMock(TilesContainer.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
ListAttribute listAttribute = new ListAttribute();
Integer requestItem = new Integer(1);
composeStack.push(listAttribute);
Modified: tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/PutListAttributeModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/PutListAttributeModelTest.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/PutListAttributeModelTest.java (original)
+++ tiles/framework/trunk/tiles-template/src/test/java/org/apache/tiles/template/PutListAttributeModelTest.java Sat Jul 25 13:20:26 2009
@@ -21,11 +21,10 @@
package org.apache.tiles.template;
-import static org.junit.Assert.*;
import static org.easymock.EasyMock.*;
+import static org.junit.Assert.*;
-import java.util.Stack;
-
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.ListAttribute;
import org.apache.tiles.TilesContainer;
@@ -53,11 +52,11 @@
}
/**
- * Test method for {@link org.apache.tiles.template.PutListAttributeModel#start(Stack, String, boolean)}.
+ * Test method for {@link org.apache.tiles.template.PutListAttributeModel#start(ArrayStack, String, boolean)}.
*/
@Test
public void testStart() {
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
model.start(composeStack, "myRole", false);
assertEquals(1, composeStack.size());
ListAttribute listAttribute = (ListAttribute) composeStack.peek();
@@ -66,13 +65,13 @@
/**
* Test method for {@link org.apache.tiles.template.PutListAttributeModel
- * #end(org.apache.tiles.TilesContainer, Stack, String, boolean, Object...)}.
+ * #end(org.apache.tiles.TilesContainer, ArrayStack, String, boolean, Object...)}.
*/
@Test
public void testEnd() {
TilesContainer container = createMock(TilesContainer.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
ListAttribute listAttribute = new ListAttribute();
Integer requestItem = new Integer(1);
composeStack.push(listAttribute);
Modified: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityUtil.java Sat Jul 25 13:20:26 2009
@@ -24,11 +24,11 @@
import java.io.IOException;
import java.io.Writer;
import java.util.Map;
-import java.util.Stack;
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;
@@ -97,11 +97,11 @@
* @since 2.2.0
*/
@SuppressWarnings("unchecked")
- public static Stack<Map<String, Object>> getParameterStack(Context context) {
- Stack<Map<String, Object>> stack = (Stack<Map<String, Object>>) context
+ 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 Stack<Map<String, Object>>();
+ stack = new ArrayStack<Map<String, Object>>();
context.put(PARAMETER_MAP_STACK_KEY, stack);
}
return stack;
Modified: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityUtilTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityUtilTest.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityUtilTest.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityUtilTest.java Sat Jul 25 13:20:26 2009
@@ -27,12 +27,12 @@
import java.util.HashMap;
import java.util.Map;
-import java.util.Stack;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+import org.apache.tiles.ArrayStack;
import org.apache.velocity.context.Context;
import org.junit.Test;
@@ -74,16 +74,17 @@
Context velocityContext = createMock(Context.class);
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(null);
- expect(velocityContext.put(eq(PARAMETER_MAP_STACK_KEY), isA(Stack.class))).andReturn(null);
+ expect(velocityContext.put(eq(PARAMETER_MAP_STACK_KEY),
+ isA(ArrayStack.class))).andReturn(null);
replay(velocityContext);
- Stack<Map<String, Object>> paramStack = getParameterStack(velocityContext);
+ ArrayStack<Map<String, Object>> paramStack = getParameterStack(velocityContext);
assertNotNull(paramStack);
assertEquals(0, paramStack.size());
verify(velocityContext);
reset(velocityContext);
- paramStack = new Stack<Map<String, Object>>();
+ paramStack = new ArrayStack<Map<String, Object>>();
paramStack.push(new HashMap<String, Object>());
expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
Modified: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java?rev=797765&r1=797764&r2=797765&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java Sat Jul 25 13:20:26 2009
@@ -21,16 +21,17 @@
package org.apache.tiles.velocity.template;
-import static org.junit.Assert.*;
+import static org.easymock.EasyMock.*;
import static org.easymock.classextension.EasyMock.*;
+import static org.junit.Assert.*;
import java.util.HashMap;
import java.util.Map;
-import java.util.Stack;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.tiles.ArrayStack;
import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.AddAttributeModel;
import org.apache.tiles.velocity.context.VelocityUtil;
@@ -78,7 +79,7 @@
HttpServletResponse response = createMock(HttpServletResponse.class);
Context velocityContext = createMock(Context.class);
Map<String, Object> params = createParams();
- Stack<Object> composeStack = new Stack<Object>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME))
.andReturn(composeStack);
@@ -100,8 +101,8 @@
HttpServletResponse response = createMock(HttpServletResponse.class);
Context velocityContext = createMock(Context.class);
Map<String, Object> params = createParams();
- Stack<Object> composeStack = new Stack<Object>();
- Stack<Map<String, Object>> parameterMapStack = new Stack<Map<String, Object>>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
+ ArrayStack<Map<String, Object>> parameterMapStack = new ArrayStack<Map<String, Object>>();
expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME))
.andReturn(composeStack);
@@ -126,8 +127,8 @@
HttpServletResponse response = createMock(HttpServletResponse.class);
Context velocityContext = createMock(Context.class);
Map<String, Object> params = createParams();
- Stack<Object> composeStack = new Stack<Object>();
- Stack<Map<String, Object>> parameterMapStack = new Stack<Map<String, Object>>();
+ ArrayStack<Object> composeStack = new ArrayStack<Object>();
+ ArrayStack<Map<String, Object>> parameterMapStack = new ArrayStack<Map<String, Object>>();
parameterMapStack.push(params);
expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME))