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 2007/10/04 21:03:37 UTC
svn commit: r581987 - in
/tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles:
portlet/context/ servlet/context/
Author: apetrelli
Date: Thu Oct 4 12:03:29 2007
New Revision: 581987
URL: http://svn.apache.org/viewvc?rev=581987&view=rev
Log:
TILES-209
Merge from trunk to TILES_2_0_X branch.
Modified "equals" method of param/header/attribute maps.
Modified:
tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java
tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java
tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java
tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java
tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java
tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java
tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletApplicationScopeMap.java
tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderMap.java
tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java
tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletInitParamMap.java
tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamMap.java
tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java
tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletRequestScopeMap.java
tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletSessionScopeMap.java
Modified: tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java?rev=581987&r1=581986&r2=581987&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java Thu Oct 4 12:03:29 2007
@@ -108,8 +108,21 @@
/** {@inheritDoc} */
+ @SuppressWarnings("unchecked")
public boolean equals(Object o) {
- return (context.equals(o));
+ PortletContext otherContext = ((PortletApplicationScopeMap) o).context;
+ boolean retValue = true;
+ synchronized (context) {
+ for (Enumeration<String> attribs = context.getAttributeNames(); attribs
+ .hasMoreElements()
+ && retValue;) {
+ String parameterName = attribs.nextElement();
+ retValue = context.getAttribute(parameterName).equals(
+ otherContext.getAttribute(parameterName));
+ }
+ }
+
+ return retValue;
}
Modified: tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java?rev=581987&r1=581986&r2=581987&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java Thu Oct 4 12:03:29 2007
@@ -99,8 +99,21 @@
/** {@inheritDoc} */
+ @SuppressWarnings("unchecked")
public boolean equals(Object o) {
- return (context.equals(o));
+ PortletContext otherContext = ((PortletInitParamMap) o).context;
+ boolean retValue = true;
+ synchronized (context) {
+ for (Enumeration<String> attribs = context.getInitParameterNames(); attribs
+ .hasMoreElements()
+ && retValue;) {
+ String parameterName = attribs.nextElement();
+ retValue = context.getInitParameter(parameterName).equals(
+ otherContext.getInitParameter(parameterName));
+ }
+ }
+
+ return retValue;
}
Modified: tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java?rev=581987&r1=581986&r2=581987&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java Thu Oct 4 12:03:29 2007
@@ -100,8 +100,21 @@
/** {@inheritDoc} */
+ @SuppressWarnings("unchecked")
public boolean equals(Object o) {
- return (request.equals(o));
+ PortletRequest otherRequest = ((PortletParamMap) o).request;
+ boolean retValue = true;
+ synchronized (request) {
+ for (Enumeration<String> attribs = request.getParameterNames(); attribs
+ .hasMoreElements()
+ && retValue;) {
+ String parameterName = attribs.nextElement();
+ retValue = request.getParameter(parameterName).equals(
+ otherRequest.getParameter(parameterName));
+ }
+ }
+
+ return retValue;
}
Modified: tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java?rev=581987&r1=581986&r2=581987&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java Thu Oct 4 12:03:29 2007
@@ -21,12 +21,19 @@
package org.apache.tiles.portlet.context;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import javax.portlet.PortletRequest;
import org.apache.tiles.context.MapEntry;
-import java.util.*;
-
/**
* <p>Private implementation of <code>Map</code> for portlet parameter
@@ -108,8 +115,21 @@
/** {@inheritDoc} */
+ @SuppressWarnings("unchecked")
public boolean equals(Object o) {
- return (request.equals(o));
+ PortletRequest otherRequest = ((PortletParamValuesMap) o).request;
+ boolean retValue = true;
+ synchronized (request) {
+ for (Enumeration<String> attribs = request.getParameterNames(); attribs
+ .hasMoreElements()
+ && retValue;) {
+ String parameterName = attribs.nextElement();
+ retValue = request.getParameterValues(parameterName).equals(
+ otherRequest.getParameterValues(parameterName));
+ }
+ }
+
+ return retValue;
}
Modified: tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java?rev=581987&r1=581986&r2=581987&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java Thu Oct 4 12:03:29 2007
@@ -108,8 +108,21 @@
/** {@inheritDoc} */
+ @SuppressWarnings("unchecked")
public boolean equals(Object o) {
- return (request.equals(o));
+ PortletRequest otherRequest = ((PortletRequestScopeMap) o).request;
+ boolean retValue = true;
+ synchronized (request) {
+ for (Enumeration<String> attribs = request.getAttributeNames(); attribs
+ .hasMoreElements()
+ && retValue;) {
+ String attributeName = attribs.nextElement();
+ retValue = request.getAttribute(attributeName).equals(
+ otherRequest.getAttribute(attributeName));
+ }
+ }
+
+ return retValue;
}
Modified: tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java?rev=581987&r1=581986&r2=581987&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java Thu Oct 4 12:03:29 2007
@@ -109,8 +109,21 @@
/** {@inheritDoc} */
+ @SuppressWarnings("unchecked")
public boolean equals(Object o) {
- return (session.equals(o));
+ PortletSession otherSession = ((PortletSessionScopeMap) o).session;
+ boolean retValue = true;
+ synchronized (session) {
+ for (Enumeration<String> attribs = session.getAttributeNames(); attribs
+ .hasMoreElements()
+ && retValue;) {
+ String attributeName = attribs.nextElement();
+ retValue = session.getAttribute(attributeName).equals(
+ otherSession.getAttribute(attributeName));
+ }
+ }
+
+ return retValue;
}
Modified: tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletApplicationScopeMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletApplicationScopeMap.java?rev=581987&r1=581986&r2=581987&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletApplicationScopeMap.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletApplicationScopeMap.java Thu Oct 4 12:03:29 2007
@@ -108,8 +108,21 @@
/** {@inheritDoc} */
+ @SuppressWarnings("unchecked")
public boolean equals(Object o) {
- return (context.equals(o));
+ ServletContext otherContext = ((ServletApplicationScopeMap) o).context;
+ boolean retValue = true;
+ synchronized (context) {
+ for (Enumeration<String> attribs = context.getAttributeNames(); attribs
+ .hasMoreElements()
+ && retValue;) {
+ String parameterName = attribs.nextElement();
+ retValue = context.getAttribute(parameterName).equals(
+ otherContext.getAttribute(parameterName));
+ }
+ }
+
+ return retValue;
}
Modified: tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderMap.java?rev=581987&r1=581986&r2=581987&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderMap.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderMap.java Thu Oct 4 12:03:29 2007
@@ -99,8 +99,21 @@
/** {@inheritDoc} */
+ @SuppressWarnings("unchecked")
public boolean equals(Object o) {
- return (request.equals(o));
+ HttpServletRequest otherRequest = ((ServletHeaderMap) o).request;
+ boolean retValue = true;
+ synchronized (request) {
+ for (Enumeration<String> attribs = request.getHeaderNames(); attribs
+ .hasMoreElements()
+ && retValue;) {
+ String parameterName = attribs.nextElement();
+ retValue = request.getHeader(parameterName).equals(
+ otherRequest.getHeader(parameterName));
+ }
+ }
+
+ return retValue;
}
Modified: tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java?rev=581987&r1=581986&r2=581987&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java Thu Oct 4 12:03:29 2007
@@ -108,8 +108,21 @@
/** {@inheritDoc} */
- public boolean equals(Object o) {
- return (request.equals(o));
+ @SuppressWarnings("unchecked")
+ public boolean equals(Object o) {
+ HttpServletRequest otherRequest = ((ServletHeaderValuesMap) o).request;
+ boolean retValue = true;
+ synchronized (request) {
+ for (Enumeration<String> attribs = request.getHeaderNames(); attribs
+ .hasMoreElements()
+ && retValue;) {
+ String parameterName = attribs.nextElement();
+ retValue = request.getHeaders(parameterName).equals(
+ otherRequest.getHeaders(parameterName));
+ }
+ }
+
+ return retValue;
}
Modified: tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletInitParamMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletInitParamMap.java?rev=581987&r1=581986&r2=581987&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletInitParamMap.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletInitParamMap.java Thu Oct 4 12:03:29 2007
@@ -99,8 +99,21 @@
/** {@inheritDoc} */
+ @SuppressWarnings("unchecked")
public boolean equals(Object o) {
- return (context.equals(o));
+ ServletContext otherContext = ((ServletInitParamMap) o).context;
+ boolean retValue = true;
+ synchronized (context) {
+ for (Enumeration<String> attribs = context.getInitParameterNames(); attribs
+ .hasMoreElements()
+ && retValue;) {
+ String parameterName = attribs.nextElement();
+ retValue = context.getInitParameter(parameterName).equals(
+ otherContext.getInitParameter(parameterName));
+ }
+ }
+
+ return retValue;
}
Modified: tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamMap.java?rev=581987&r1=581986&r2=581987&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamMap.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamMap.java Thu Oct 4 12:03:29 2007
@@ -29,6 +29,7 @@
import java.util.Map;
import java.util.Set;
+import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import org.apache.tiles.context.MapEntry;
@@ -99,8 +100,21 @@
/** {@inheritDoc} */
+ @SuppressWarnings("unchecked")
public boolean equals(Object o) {
- return (request.equals(o));
+ ServletRequest otherRequest = ((ServletParamMap) o).request;
+ boolean retValue = true;
+ synchronized (request) {
+ for (Enumeration<String> attribs = request.getParameterNames(); attribs
+ .hasMoreElements()
+ && retValue;) {
+ String parameterName = attribs.nextElement();
+ retValue = request.getParameter(parameterName).equals(
+ otherRequest.getParameter(parameterName));
+ }
+ }
+
+ return retValue;
}
Modified: tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java?rev=581987&r1=581986&r2=581987&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java Thu Oct 4 12:03:29 2007
@@ -106,8 +106,21 @@
/** {@inheritDoc} */
- public boolean equals(Object o) {
- return (request.equals(o));
+ @SuppressWarnings("unchecked")
+ public boolean equals(Object o) {
+ ServletRequest otherRequest = ((ServletParamValuesMap) o).request;
+ boolean retValue = true;
+ synchronized (request) {
+ for (Enumeration<String> attribs = request.getParameterNames(); attribs
+ .hasMoreElements()
+ && retValue;) {
+ String parameterName = attribs.nextElement();
+ retValue = request.getParameterValues(parameterName).equals(
+ otherRequest.getParameterValues(parameterName));
+ }
+ }
+
+ return retValue;
}
Modified: tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletRequestScopeMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletRequestScopeMap.java?rev=581987&r1=581986&r2=581987&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletRequestScopeMap.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletRequestScopeMap.java Thu Oct 4 12:03:29 2007
@@ -107,8 +107,21 @@
/** {@inheritDoc} */
+ @SuppressWarnings("unchecked")
public boolean equals(Object o) {
- return (request.equals(o));
+ ServletRequest otherRequest = ((ServletRequestScopeMap) o).request;
+ boolean retValue = true;
+ synchronized (request) {
+ for (Enumeration<String> attribs = request.getAttributeNames(); attribs
+ .hasMoreElements()
+ && retValue;) {
+ String attributeName = attribs.nextElement();
+ retValue = request.getAttribute(attributeName).equals(
+ otherRequest.getAttribute(attributeName));
+ }
+ }
+
+ return retValue;
}
Modified: tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletSessionScopeMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletSessionScopeMap.java?rev=581987&r1=581986&r2=581987&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletSessionScopeMap.java (original)
+++ tiles/framework/branches/TILES_2_0_X/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletSessionScopeMap.java Thu Oct 4 12:03:29 2007
@@ -28,6 +28,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@@ -118,13 +119,28 @@
/** {@inheritDoc} */
+ @SuppressWarnings("unchecked")
public boolean equals(Object o) {
+ boolean retValue = true;
+
HttpSession session = request.getSession(false);
- if (session == null) {
- return o == null;
- } else {
- return (session.equals(o));
+ synchronized (session) {
+ HttpSession otherSession = ((ServletSessionScopeMap) o).request
+ .getSession(false);
+ if (session == null) {
+ retValue = otherSession == null;
+ } else {
+ for (Enumeration<String> attribs = session.getAttributeNames(); attribs
+ .hasMoreElements()
+ && retValue;) {
+ String attributeName = attribs.nextElement();
+ retValue = session.getAttribute(attributeName).equals(
+ otherSession.getAttribute(attributeName));
+ }
+ }
}
+
+ return retValue;
}