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 2008/02/01 20:06:30 UTC
svn commit: r617611 - in /tiles/framework/trunk:
tiles-api/src/main/java/org/apache/tiles/
tiles-core/src/main/java/org/apache/tiles/context/
tiles-core/src/main/java/org/apache/tiles/impl/
tiles-core/src/test/java/org/apache/tiles/context/
Author: apetrelli
Date: Fri Feb 1 11:06:23 2008
New Revision: 617611
URL: http://svn.apache.org/viewvc?rev=617611&view=rev
Log:
TILES-245
First step: moved BasicAttributeContext to tiles-api.
Added:
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java
- copied, changed from r616881, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/BasicAttributeContext.java
Removed:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/BasicAttributeContext.java
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/context/BasicAttributeContextTest.java
Copied: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java (from r616881, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/BasicAttributeContext.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java?p2=tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/BasicAttributeContext.java&r1=616881&r2=617611&rev=617611&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/BasicAttributeContext.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java Fri Feb 1 11:06:23 2008
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.tiles.context;
+package org.apache.tiles;
import java.io.Serializable;
import java.util.ArrayList;
@@ -28,10 +28,6 @@
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import java.util.Stack;
-
-import org.apache.tiles.Attribute;
-import org.apache.tiles.AttributeContext;
/**
* Basic implementation for <code>AttributeContext</code>.
@@ -41,20 +37,14 @@
public class BasicAttributeContext implements AttributeContext, Serializable {
/**
- * Name used to store attribute context stack.
- */
- private static final String ATTRIBUTE_CONTEXT_STACK =
- "org.apache.tiles.AttributeContext.STACK";
-
- /**
* Template attributes.
*/
- private Map<String, Attribute> attributes = null;
+ protected Map<String, Attribute> attributes = null;
/**
* Cascaded template attributes.
*/
- private Map<String, Attribute> cascadedAttributes = null;
+ protected Map<String, Attribute> cascadedAttributes = null;
/**
* Constructor.
@@ -261,74 +251,6 @@
mapToUse = attributes;
}
mapToUse.put(name, value);
- }
-
- /**
- * Get attribute context from request.
- *
- * @param tilesContext current Tiles application context.
- * @return BasicAttributeContext or null if context is not found or an
- * jspException is present in the request.
- * @deprecated Use {@link TilesContainer#getAttributeContext(Object...)}.
- */
- @Deprecated
- public static AttributeContext getContext(TilesRequestContext tilesContext) {
- Stack<AttributeContext> contextStack = getContextStack(tilesContext);
- if (!contextStack.isEmpty()) {
- return contextStack.peek();
- } else {
- return null;
- }
- }
-
- /**
- * Returns the context stack.
- *
- * @param tilesContext The Tiles context object to use.
- * @return The needed stack of contexts.
- * @deprecated Use {@link TilesContainer#getAttributeContext(Object...)},
- * {@link TilesContainer#startContext(Object...)} or
- * {@link TilesContainer#endContext(Object...)}.
- */
- @Deprecated
- @SuppressWarnings("unchecked")
- public static Stack<AttributeContext> getContextStack(TilesRequestContext tilesContext) {
- Stack<AttributeContext> contextStack =
- (Stack<AttributeContext>) tilesContext.getRequestScope().get(
- BasicAttributeContext.ATTRIBUTE_CONTEXT_STACK);
- if (contextStack == null) {
- contextStack = new Stack<AttributeContext>();
- tilesContext.getRequestScope().put(BasicAttributeContext.ATTRIBUTE_CONTEXT_STACK,
- contextStack);
- }
-
- return contextStack;
- }
-
- /**
- * Pushes a context object in the stack.
- *
- * @param context The context to push.
- * @param tilesContext The Tiles context object to use.
- * @deprecated Use {@link TilesContainer#startContext(Object...)}.
- */
- @Deprecated
- public static void pushContext(AttributeContext context,
- TilesRequestContext tilesContext) {
- Stack<AttributeContext> contextStack = getContextStack(tilesContext);
- contextStack.push(context);
- }
-
- /**
- * Pops a context object out of the stack.
- *
- * @param tilesContext The Tiles context object to use.
- * @return The popped context object.
- * @deprecated Use {@link TilesContainer#endContext(Object...)}.
- */
- public static AttributeContext popContext(TilesRequestContext tilesContext) {
- Stack<AttributeContext> contextStack = getContextStack(tilesContext);
- return contextStack.pop();
}
/** {@inheritDoc} */
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=617611&r1=617610&r2=617611&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 Fri Feb 1 11:06:23 2008
@@ -24,12 +24,12 @@
import org.apache.commons.logging.LogFactory;
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
+import org.apache.tiles.BasicAttributeContext;
import org.apache.tiles.Definition;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.TilesException;
import org.apache.tiles.Attribute.AttributeType;
-import org.apache.tiles.context.BasicAttributeContext;
import org.apache.tiles.context.TilesContextFactory;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.definition.DefinitionsFactory;
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/context/BasicAttributeContextTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/context/BasicAttributeContextTest.java?rev=617611&r1=617610&r2=617611&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/context/BasicAttributeContextTest.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/context/BasicAttributeContextTest.java Fri Feb 1 11:06:23 2008
@@ -27,6 +27,7 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
+import org.apache.tiles.BasicAttributeContext;
import org.easymock.EasyMock;
import junit.framework.TestCase;