You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2011/08/27 14:34:17 UTC
svn commit: r1162332 [2/3] - in
/commons/proper/chain/branches/version-2.0-work: ./
src/main/java/org/apache/commons/chain/
src/main/java/org/apache/commons/chain/config/
src/main/java/org/apache/commons/chain/generic/
src/main/java/org/apache/commons/...
Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletGetLocaleCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletGetLocaleCommand.java?rev=1162332&r1=1162331&r2=1162332&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletGetLocaleCommand.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletGetLocaleCommand.java Sat Aug 27 12:34:14 2011
@@ -26,9 +26,11 @@ import org.apache.commons.chain.web.Abst
/**
* <p>Concrete implementation of {@link AbstractGetLocaleCommand} for
* the Portlet API.</p>
+ *
+ * @param <T> Type of the context associated with this command
*/
-public class PortletGetLocaleCommand extends AbstractGetLocaleCommand {
+public class PortletGetLocaleCommand<T extends Context> extends AbstractGetLocaleCommand<T> {
// ------------------------------------------------------- Protected Methods
@@ -40,7 +42,7 @@ public class PortletGetLocaleCommand ext
* @param context The {@link Context} we are operating on.
* @return The Locale for the request.
*/
- protected Locale getLocale(Context context) {
+ protected Locale getLocale(T context) {
PortletRequest request = (PortletRequest)
context.get("request");
Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletInitParamMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletInitParamMap.java?rev=1162332&r1=1162331&r2=1162332&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletInitParamMap.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletInitParamMap.java Sat Aug 27 12:34:14 2011
@@ -21,7 +21,6 @@ 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;
@@ -37,7 +36,7 @@ import org.apache.commons.chain.web.MapE
* @version $Revision$ $Date$
*/
-final class PortletInitParamMap implements Map {
+final class PortletInitParamMap implements Map<String, String> {
public PortletInitParamMap(PortletContext context) {
@@ -48,62 +47,65 @@ final class PortletInitParamMap implemen
private PortletContext context = null;
+ @Override
public void clear() {
throw new UnsupportedOperationException();
}
+ @Override
public boolean containsKey(Object key) {
return (context.getInitParameter(key(key)) != null);
}
+ @Override
public boolean containsValue(Object value) {
- Iterator values = values().iterator();
- while (values.hasNext()) {
- if (value.equals(values.next())) {
- return (true);
- }
- }
- return (false);
+ return values().contains(value);
}
- public Set entrySet() {
- Set set = new HashSet();
- Enumeration keys = context.getInitParameterNames();
+ @Override
+ public Set<Entry<String, String>> entrySet() {
+ Set<Entry<String, String>> set = new HashSet<Entry<String, String>>();
+ Enumeration<String> keys = context.getInitParameterNames();
String key;
while (keys.hasMoreElements()) {
- key = (String) keys.nextElement();
+ key = keys.nextElement();
set.add(new MapEntry(key, context.getInitParameter(key), false));
}
return (set);
}
+ @Override
public boolean equals(Object o) {
return (context.equals(o));
}
- public Object get(Object key) {
+ @Override
+ public String get(Object key) {
return (context.getInitParameter(key(key)));
}
+ @Override
public int hashCode() {
return (context.hashCode());
}
+ @Override
public boolean isEmpty() {
return (size() < 1);
}
- public Set keySet() {
- Set set = new HashSet();
- Enumeration keys = context.getInitParameterNames();
+ @Override
+ public Set<String> keySet() {
+ Set<String> set = new HashSet<String>();
+ Enumeration<String> keys = context.getInitParameterNames();
while (keys.hasMoreElements()) {
set.add(keys.nextElement());
}
@@ -111,24 +113,28 @@ final class PortletInitParamMap implemen
}
- public Object put(Object key, Object value) {
+ @Override
+ public String put(String key, String value) {
throw new UnsupportedOperationException();
}
- public void putAll(Map map) {
+ @Override
+ public void putAll(Map<? extends String, ? extends String> map) {
throw new UnsupportedOperationException();
}
- public Object remove(Object key) {
+ @Override
+ public String remove(Object key) {
throw new UnsupportedOperationException();
}
+ @Override
public int size() {
int n = 0;
- Enumeration keys = context.getInitParameterNames();
+ Enumeration<String> keys = context.getInitParameterNames();
while (keys.hasMoreElements()) {
keys.nextElement();
n++;
@@ -137,11 +143,12 @@ final class PortletInitParamMap implemen
}
- public Collection values() {
- List list = new ArrayList();
- Enumeration keys = context.getInitParameterNames();
+ @Override
+ public Collection<String> values() {
+ List<String> list = new ArrayList<String>();
+ Enumeration<String> keys = context.getInitParameterNames();
while (keys.hasMoreElements()) {
- list.add(context.getInitParameter((String) keys.nextElement()));
+ list.add(context.getInitParameter(keys.nextElement()));
}
return (list);
}
Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletParamMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletParamMap.java?rev=1162332&r1=1162331&r2=1162332&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletParamMap.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletParamMap.java Sat Aug 27 12:34:14 2011
@@ -21,7 +21,6 @@ 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;
@@ -37,7 +36,7 @@ import org.apache.commons.chain.web.MapE
* @version $Revision$ $Date$
*/
-final class PortletParamMap implements Map {
+final class PortletParamMap implements Map<String, String> {
public PortletParamMap(PortletRequest request) {
@@ -48,62 +47,65 @@ final class PortletParamMap implements M
private PortletRequest request = null;
+ @Override
public void clear() {
throw new UnsupportedOperationException();
}
+ @Override
public boolean containsKey(Object key) {
return (request.getParameter(key(key)) != null);
}
+ @Override
public boolean containsValue(Object value) {
- Iterator values = values().iterator();
- while (values.hasNext()) {
- if (value.equals(values.next())) {
- return (true);
- }
- }
- return (false);
+ return values().contains(value);
}
- public Set entrySet() {
- Set set = new HashSet();
- Enumeration keys = request.getParameterNames();
+ @Override
+ public Set<Entry<String, String>> entrySet() {
+ Set<Entry<String, String>> set = new HashSet<Entry<String, String>>();
+ Enumeration<String> keys = request.getParameterNames();
String key;
while (keys.hasMoreElements()) {
- key = (String) keys.nextElement();
+ key = keys.nextElement();
set.add(new MapEntry(key, request.getParameter(key), false));
}
return (set);
}
+ @Override
public boolean equals(Object o) {
return (request.equals(o));
}
- public Object get(Object key) {
+ @Override
+ public String get(Object key) {
return (request.getParameter(key(key)));
}
+ @Override
public int hashCode() {
return (request.hashCode());
}
+ @Override
public boolean isEmpty() {
return (size() < 1);
}
- public Set keySet() {
- Set set = new HashSet();
- Enumeration keys = request.getParameterNames();
+ @Override
+ public Set<String> keySet() {
+ Set<String> set = new HashSet<String>();
+ Enumeration<String> keys = request.getParameterNames();
while (keys.hasMoreElements()) {
set.add(keys.nextElement());
}
@@ -111,24 +113,28 @@ final class PortletParamMap implements M
}
- public Object put(Object key, Object value) {
+ @Override
+ public String put(String key, String value) {
throw new UnsupportedOperationException();
}
- public void putAll(Map map) {
+ @Override
+ public void putAll(Map<? extends String, ? extends String> map) {
throw new UnsupportedOperationException();
}
- public Object remove(Object key) {
+ @Override
+ public String remove(Object key) {
throw new UnsupportedOperationException();
}
+ @Override
public int size() {
int n = 0;
- Enumeration keys = request.getParameterNames();
+ Enumeration<String> keys = request.getParameterNames();
while (keys.hasMoreElements()) {
keys.nextElement();
n++;
@@ -137,9 +143,10 @@ final class PortletParamMap implements M
}
- public Collection values() {
- List list = new ArrayList();
- Enumeration keys = request.getParameterNames();
+ @Override
+ public Collection<String> values() {
+ List<String> list = new ArrayList<String>();
+ Enumeration<String> keys = request.getParameterNames();
while (keys.hasMoreElements()) {
list.add(request.getParameter((String) keys.nextElement()));
}
Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletParamValuesMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletParamValuesMap.java?rev=1162332&r1=1162331&r2=1162332&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletParamValuesMap.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletParamValuesMap.java Sat Aug 27 12:34:14 2011
@@ -21,7 +21,6 @@ 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;
@@ -37,7 +36,7 @@ import org.apache.commons.chain.web.MapE
* @version $Revision$ $Date$
*/
-final class PortletParamValuesMap implements Map {
+final class PortletParamValuesMap implements Map<String, String[]> {
public PortletParamValuesMap(PortletRequest request) {
@@ -48,62 +47,65 @@ final class PortletParamValuesMap implem
private PortletRequest request = null;
+ @Override
public void clear() {
throw new UnsupportedOperationException();
}
+ @Override
public boolean containsKey(Object key) {
return (request.getParameter(key(key)) != null);
}
+ @Override
public boolean containsValue(Object value) {
- Iterator values = values().iterator();
- while (values.hasNext()) {
- if (value.equals(values.next())) {
- return (true);
- }
- }
- return (false);
+ return values().contains(value);
}
- public Set entrySet() {
- Set set = new HashSet();
- Enumeration keys = request.getParameterNames();
+ @Override
+ public Set<Entry<String, String[]>> entrySet() {
+ Set<Entry<String, String[]>> set = new HashSet<Entry<String, String[]>>();
+ Enumeration<String> keys = request.getParameterNames();
String key;
while (keys.hasMoreElements()) {
- key = (String) keys.nextElement();
- set.add(new MapEntry(key, request.getParameterValues(key), false));
+ key = keys.nextElement();
+ set.add(new MapEntry<String, String[]>(key, request.getParameterValues(key), false));
}
return (set);
}
+ @Override
public boolean equals(Object o) {
return (request.equals(o));
}
- public Object get(Object key) {
+ @Override
+ public String[] get(Object key) {
return (request.getParameterValues(key(key)));
}
+ @Override
public int hashCode() {
return (request.hashCode());
}
+ @Override
public boolean isEmpty() {
return (size() < 1);
}
- public Set keySet() {
- Set set = new HashSet();
- Enumeration keys = request.getParameterNames();
+ @Override
+ public Set<String> keySet() {
+ Set<String> set = new HashSet<String>();
+ Enumeration<String> keys = request.getParameterNames();
while (keys.hasMoreElements()) {
set.add(keys.nextElement());
}
@@ -111,24 +113,28 @@ final class PortletParamValuesMap implem
}
- public Object put(Object key, Object value) {
+ @Override
+ public String[] put(String key, String[] value) {
throw new UnsupportedOperationException();
}
- public void putAll(Map map) {
+ @Override
+ public void putAll(Map<? extends String, ? extends String[]> map) {
throw new UnsupportedOperationException();
}
- public Object remove(Object key) {
+ @Override
+ public String[] remove(Object key) {
throw new UnsupportedOperationException();
}
+ @Override
public int size() {
int n = 0;
- Enumeration keys = request.getParameterNames();
+ Enumeration<String> keys = request.getParameterNames();
while (keys.hasMoreElements()) {
keys.nextElement();
n++;
@@ -137,11 +143,12 @@ final class PortletParamValuesMap implem
}
- public Collection values() {
- List list = new ArrayList();
- Enumeration keys = request.getParameterNames();
+ @Override
+ public Collection<String[]> values() {
+ List<String[]> list = new ArrayList<String[]>();
+ Enumeration<String> keys = request.getParameterNames();
while (keys.hasMoreElements()) {
- list.add(request.getParameterValues((String) keys.nextElement()));
+ list.add(request.getParameterValues(keys.nextElement()));
}
return (list);
}
Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletRequestScopeMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletRequestScopeMap.java?rev=1162332&r1=1162331&r2=1162332&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletRequestScopeMap.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletRequestScopeMap.java Sat Aug 27 12:34:14 2011
@@ -21,7 +21,6 @@ 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;
@@ -37,7 +36,7 @@ import org.apache.commons.chain.web.MapE
* @version $Revision$ $Date$
*/
-final class PortletRequestScopeMap implements Map {
+final class PortletRequestScopeMap implements Map<String, Object> {
public PortletRequestScopeMap(PortletRequest request) {
@@ -48,26 +47,28 @@ final class PortletRequestScopeMap imple
private PortletRequest request = null;
+ @Override
public void clear() {
- Iterator keys = keySet().iterator();
- while (keys.hasNext()) {
- request.removeAttribute((String) keys.next());
+ for (String key : keySet()) {
+ request.removeAttribute(key);
}
}
+ @Override
public boolean containsKey(Object key) {
return (request.getAttribute(key(key)) != null);
}
+ @Override
public boolean containsValue(Object value) {
if (value == null) {
return (false);
}
- Enumeration keys = request.getAttributeNames();
+ Enumeration<String> keys = request.getAttributeNames();
while (keys.hasMoreElements()) {
- Object next = request.getAttribute((String) keys.nextElement());
+ Object next = request.getAttribute(keys.nextElement());
if (value.equals(next)) {
return (true);
}
@@ -76,41 +77,47 @@ final class PortletRequestScopeMap imple
}
- public Set entrySet() {
- Set set = new HashSet();
- Enumeration keys = request.getAttributeNames();
+ @Override
+ public Set<Entry<String, Object>> entrySet() {
+ Set<Entry<String, Object>> set = new HashSet<Entry<String, Object>>();
+ Enumeration<String> keys = request.getAttributeNames();
String key;
while (keys.hasMoreElements()) {
- key = (String) keys.nextElement();
+ key = keys.nextElement();
set.add(new MapEntry(key, request.getAttribute(key), true));
}
return (set);
}
+ @Override
public boolean equals(Object o) {
return (request.equals(o));
}
+ @Override
public Object get(Object key) {
return (request.getAttribute(key(key)));
}
+ @Override
public int hashCode() {
return (request.hashCode());
}
+ @Override
public boolean isEmpty() {
return (size() < 1);
}
- public Set keySet() {
- Set set = new HashSet();
- Enumeration keys = request.getAttributeNames();
+ @Override
+ public Set<String> keySet() {
+ Set<String> set = new HashSet<String>();
+ Enumeration<String> keys = request.getAttributeNames();
while (keys.hasMoreElements()) {
set.add(keys.nextElement());
}
@@ -118,7 +125,8 @@ final class PortletRequestScopeMap imple
}
- public Object put(Object key, Object value) {
+ @Override
+ public Object put(String key, Object value) {
if (value == null) {
return (remove(key));
}
@@ -129,15 +137,15 @@ final class PortletRequestScopeMap imple
}
- public void putAll(Map map) {
- Iterator entries = map.entrySet().iterator();
- while (entries.hasNext()) {
- Map.Entry entry = (Map.Entry)entries.next();
- put(entry.getKey(), entry.getValue());
+ @Override
+ public void putAll(Map<? extends String, ? extends Object> map) {
+ for (Entry<? extends String, ? extends Object> entry : map.entrySet()) {
+ put(key(entry.getKey()), entry.getValue());
}
}
+ @Override
public Object remove(Object key) {
String skey = key(key);
Object previous = request.getAttribute(skey);
@@ -146,9 +154,10 @@ final class PortletRequestScopeMap imple
}
+ @Override
public int size() {
int n = 0;
- Enumeration keys = request.getAttributeNames();
+ Enumeration<String> keys = request.getAttributeNames();
while (keys.hasMoreElements()) {
keys.nextElement();
n++;
@@ -157,11 +166,12 @@ final class PortletRequestScopeMap imple
}
- public Collection values() {
- List list = new ArrayList();
- Enumeration keys = request.getAttributeNames();
+ @Override
+ public Collection<Object> values() {
+ List<Object> list = new ArrayList<Object>();
+ Enumeration<String> keys = request.getAttributeNames();
while (keys.hasMoreElements()) {
- list.add(request.getAttribute((String) keys.nextElement()));
+ list.add(request.getAttribute(keys.nextElement()));
}
return (list);
}
Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletSessionScopeMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletSessionScopeMap.java?rev=1162332&r1=1162331&r2=1162332&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletSessionScopeMap.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletSessionScopeMap.java Sat Aug 27 12:34:14 2011
@@ -21,7 +21,6 @@ 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;
@@ -38,7 +37,7 @@ import org.apache.commons.chain.web.MapE
* @version $Revision$ $Date$
*/
-final class PortletSessionScopeMap implements Map {
+final class PortletSessionScopeMap implements Map<String, Object> {
public PortletSessionScopeMap(PortletRequest request) {
@@ -51,16 +50,17 @@ final class PortletSessionScopeMap imple
private PortletRequest request = null;
+ @Override
public void clear() {
if (sessionExists()) {
- Iterator keys = keySet().iterator();
- while (keys.hasNext()) {
- session.removeAttribute((String) keys.next());
+ for (String key : keySet()) {
+ session.removeAttribute(key);
}
}
}
+ @Override
public boolean containsKey(Object key) {
if (sessionExists()) {
return (session.getAttribute(key(key)) != null);
@@ -70,14 +70,15 @@ final class PortletSessionScopeMap imple
}
+ @Override
public boolean containsValue(Object value) {
if (value == null || !sessionExists()) {
return (false);
}
- Enumeration keys =
+ Enumeration<String> keys =
session.getAttributeNames(PortletSession.PORTLET_SCOPE);
while (keys.hasMoreElements()) {
- Object next = session.getAttribute((String) keys.nextElement());
+ Object next = session.getAttribute(keys.nextElement());
if (value.equals(next)) {
return (true);
}
@@ -86,21 +87,23 @@ final class PortletSessionScopeMap imple
}
- public Set entrySet() {
- Set set = new HashSet();
+ @Override
+ public Set<Entry<String, Object>> entrySet() {
+ Set<Entry<String, Object>> set = new HashSet<Entry<String, Object>>();
if (sessionExists()) {
- Enumeration keys =
+ Enumeration<String> keys =
session.getAttributeNames(PortletSession.PORTLET_SCOPE);
String key;
while (keys.hasMoreElements()) {
- key = (String) keys.nextElement();
- set.add(new MapEntry(key, session.getAttribute(key), true));
+ key = keys.nextElement();
+ set.add(new MapEntry<String, Object>(key, session.getAttribute(key), true));
}
}
return (set);
}
+ @Override
public boolean equals(Object o) {
if (sessionExists()) {
return (session.equals(o));
@@ -110,6 +113,7 @@ final class PortletSessionScopeMap imple
}
+ @Override
public Object get(Object key) {
if (sessionExists()) {
return (session.getAttribute(key(key)));
@@ -119,6 +123,7 @@ final class PortletSessionScopeMap imple
}
+ @Override
public int hashCode() {
if (sessionExists()) {
return (session.hashCode());
@@ -128,6 +133,7 @@ final class PortletSessionScopeMap imple
}
+ @Override
public boolean isEmpty() {
if (sessionExists() &&
session.getAttributeNames().hasMoreElements()) {
@@ -138,10 +144,11 @@ final class PortletSessionScopeMap imple
}
- public Set keySet() {
- Set set = new HashSet();
+ @Override
+ public Set<String> keySet() {
+ Set<String> set = new HashSet<String>();
if (sessionExists()) {
- Enumeration keys =
+ Enumeration<String> keys =
session.getAttributeNames(PortletSession.PORTLET_SCOPE);
while (keys.hasMoreElements()) {
set.add(keys.nextElement());
@@ -151,7 +158,8 @@ final class PortletSessionScopeMap imple
}
- public Object put(Object key, Object value) {
+ @Override
+ public Object put(String key, Object value) {
if (value == null) {
return (remove(key));
}
@@ -170,15 +178,15 @@ final class PortletSessionScopeMap imple
}
- public void putAll(Map map) {
- Iterator entries = map.entrySet().iterator();
- while (entries.hasNext()) {
- Map.Entry entry = (Map.Entry)entries.next();
- put(entry.getKey(), entry.getValue());
+ @Override
+ public void putAll(Map<? extends String, ? extends Object> map) {
+ for (Entry<? extends String, ? extends Object> entry : map.entrySet()) {
+ put(key(entry.getKey()), entry.getValue());
}
}
+ @Override
public Object remove(Object key) {
if (sessionExists()) {
String skey = key(key);
@@ -191,10 +199,11 @@ final class PortletSessionScopeMap imple
}
+ @Override
public int size() {
int n = 0;
if (sessionExists()) {
- Enumeration keys =
+ Enumeration<String> keys =
session.getAttributeNames(PortletSession.PORTLET_SCOPE);
while (keys.hasMoreElements()) {
keys.nextElement();
@@ -205,13 +214,14 @@ final class PortletSessionScopeMap imple
}
- public Collection values() {
- List list = new ArrayList();
+ @Override
+ public Collection<Object> values() {
+ List<Object> list = new ArrayList<Object>();
if (sessionExists()) {
- Enumeration keys =
+ Enumeration<String> keys =
session.getAttributeNames(PortletSession.PORTLET_SCOPE);
while (keys.hasMoreElements()) {
- list.add(session.getAttribute((String) keys.nextElement()));
+ list.add(session.getAttribute(keys.nextElement()));
}
}
return (list);
Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletSetLocaleCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletSetLocaleCommand.java?rev=1162332&r1=1162331&r2=1162332&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletSetLocaleCommand.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletSetLocaleCommand.java Sat Aug 27 12:34:14 2011
@@ -26,9 +26,12 @@ import org.apache.commons.chain.web.Abst
/**
* <p>Concrete implementation of {@link AbstractSetLocaleCommand} for
* the Portlet API.</p>
+ *
+ * @param <T> Type of the context associated with this command
+ *
*/
-public class PortletSetLocaleCommand extends AbstractSetLocaleCommand {
+public class PortletSetLocaleCommand<T extends Context> extends AbstractSetLocaleCommand<T> {
// ------------------------------------------------------- Protected Methods
Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletWebContext.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletWebContext.java?rev=1162332&r1=1162331&r2=1162332&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletWebContext.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletWebContext.java Sat Aug 27 12:34:14 2011
@@ -22,6 +22,7 @@ import java.util.Map;
import javax.portlet.PortletContext;
import javax.portlet.PortletRequest;
import javax.portlet.PortletResponse;
+import javax.servlet.http.Cookie;
import org.apache.commons.chain.web.WebContext;
@@ -72,7 +73,7 @@ public class PortletWebContext extends W
* <p>The lazily instantiated <code>Map</code> of application scope
* attributes.</p>
*/
- private Map applicationScope = null;
+ private Map<String, Object> applicationScope = null;
/**
@@ -85,35 +86,35 @@ public class PortletWebContext extends W
* <p>The lazily instantiated <code>Map</code> of header name-value
* combinations (immutable).</p>
*/
- private Map header = null;
+ private Map<String, String> header = null;
/**
* <p>The lazily instantitated <code>Map</code> of header name-values
* combinations (immutable).</p>
*/
- private Map headerValues = null;
+ private Map<String, String[]> headerValues = null;
/**
* <p>The lazily instantiated <code>Map</code> of context initialization
* parameters.</p>
*/
- private Map initParam = null;
+ private Map<String, String> initParam = null;
/**
* <p>The lazily instantiated <code>Map</code> of request
* parameter name-value.</p>
*/
- private Map param = null;
+ private Map<String, String> param = null;
/**
* <p>The lazily instantiated <code>Map</code> of request
* parameter name-values.</p>
*/
- private Map paramValues = null;
+ private Map<String, String[]> paramValues = null;
/**
@@ -126,7 +127,7 @@ public class PortletWebContext extends W
* <p>The lazily instantiated <code>Map</code> of request scope
* attributes.</p>
*/
- private Map requestScope = null;
+ private Map<String, Object> requestScope = null;
/**
@@ -139,7 +140,7 @@ public class PortletWebContext extends W
* <p>The lazily instantiated <code>Map</code> of session scope
* attributes.</p>
*/
- private Map sessionScope = null;
+ private Map<String, Object> sessionScope = null;
// ---------------------------------------------------------- Public Methods
@@ -238,7 +239,8 @@ public class PortletWebContext extends W
*
* @return Application scope Map.
*/
- public Map getApplicationScope() {
+ @Override
+ public Map<String, Object> getApplicationScope() {
if ((applicationScope == null) && (context != null)) {
applicationScope = new PortletApplicationScopeMap(context);
@@ -253,7 +255,8 @@ public class PortletWebContext extends W
*
* @return Header values Map.
*/
- public Map getHeader() {
+ @Override
+ public Map<String, String> getHeader() {
if ((header == null) && (request != null)) {
// header = new PortletHeaderMap(request);
@@ -269,7 +272,8 @@ public class PortletWebContext extends W
*
* @return Header values Map.
*/
- public Map getHeaderValues() {
+ @Override
+ public Map<String, String[]> getHeaderValues() {
if ((headerValues == null) && (request != null)) {
// headerValues = new PortletHeaderValuesMap(request);
@@ -285,7 +289,8 @@ public class PortletWebContext extends W
*
* @return Initialization parameter Map.
*/
- public Map getInitParam() {
+ @Override
+ public Map<String, String> getInitParam() {
if ((initParam == null) && (context != null)) {
initParam = new PortletInitParamMap(context);
@@ -300,7 +305,8 @@ public class PortletWebContext extends W
*
* @return Request parameter Map.
*/
- public Map getParam() {
+ @Override
+ public Map<String, String> getParam() {
if ((param == null) && (request != null)) {
param = new PortletParamMap(request);
@@ -315,7 +321,8 @@ public class PortletWebContext extends W
*
* @return Request parameter Map.
*/
- public Map getParamValues() {
+ @Override
+ public Map<String, String[]> getParamValues() {
if ((paramValues == null) && (request != null)) {
paramValues = new PortletParamValuesMap(request);
@@ -331,7 +338,8 @@ public class PortletWebContext extends W
* @return An empty Map.
* @since Chain 1.1
*/
- public Map getCookies() {
+ @Override
+ public Map<String, Cookie> getCookies() {
return Collections.EMPTY_MAP;
@@ -343,7 +351,8 @@ public class PortletWebContext extends W
*
* @return Request scope Map.
*/
- public Map getRequestScope() {
+ @Override
+ public Map<String, Object> getRequestScope() {
if ((requestScope == null) && (request != null)) {
requestScope = new PortletRequestScopeMap(request);
@@ -358,7 +367,8 @@ public class PortletWebContext extends W
*
* @return Session scope Map.
*/
- public Map getSessionScope() {
+ @Override
+ public Map<String, Object> getSessionScope() {
if ((sessionScope == null) && (request != null)) {
sessionScope =
Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ChainProcessor.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ChainProcessor.java?rev=1162332&r1=1162331&r2=1162332&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ChainProcessor.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ChainProcessor.java Sat Aug 27 12:34:14 2011
@@ -125,6 +125,7 @@ public class ChainProcessor extends Chai
/**
* <p>Clean up as this application is shut down.</p>
*/
+ @Override
public void destroy() {
super.destroy();
@@ -140,6 +141,7 @@ public class ChainProcessor extends Chai
*
* @exception ServletException if an initialization error occurs
*/
+ @Override
public void init() throws ServletException {
super.init();
@@ -164,6 +166,7 @@ public class ChainProcessor extends Chai
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
+ @Override
public void service(HttpServletRequest request,
HttpServletResponse response)
throws IOException, ServletException {
Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/PathInfoMapper.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/PathInfoMapper.java?rev=1162332&r1=1162331&r2=1162332&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/PathInfoMapper.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/PathInfoMapper.java Sat Aug 27 12:34:14 2011
@@ -92,6 +92,7 @@ public class PathInfoMapper extends Look
*
* @since Chain 1.2
*/
+ @Override
protected String getCommandName(Context context) {
// Look up the extra path information for this request
@@ -117,6 +118,7 @@ public class PathInfoMapper extends Look
*
* @since Chain 1.2
*/
+ @Override
protected Catalog getCatalog(Context context) {
Catalog catalog = (Catalog) context.get(getCatalogKey());
if (catalog == null) {
Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/RequestParameterMapper.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/RequestParameterMapper.java?rev=1162332&r1=1162331&r2=1162332&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/RequestParameterMapper.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/RequestParameterMapper.java Sat Aug 27 12:34:14 2011
@@ -112,7 +112,7 @@ public class RequestParameterMapper exte
/**
- * <p>Look up the specified request paramater for this request, and use it
+ * <p>Look up the specified request parameter for this request, and use it
* to select an appropriate {@link Command} to be executed.
*
* @param context Context for the current request
@@ -120,6 +120,7 @@ public class RequestParameterMapper exte
*
* @since Chain 1.2
*/
+ @Override
protected String getCommandName(Context context) {
// Look up the specified request parameter for this request
@@ -141,6 +142,7 @@ public class RequestParameterMapper exte
*
* @since Chain 1.2
*/
+ @Override
protected Catalog getCatalog(Context context) {
Catalog catalog = (Catalog) context.get(getCatalogKey());
if (catalog == null) {
Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletApplicationScopeMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletApplicationScopeMap.java?rev=1162332&r1=1162331&r2=1162332&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletApplicationScopeMap.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletApplicationScopeMap.java Sat Aug 27 12:34:14 2011
@@ -21,7 +21,6 @@ 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;
@@ -37,7 +36,7 @@ import org.apache.commons.chain.web.MapE
* @version $Revision$ $Date$
*/
-final class ServletApplicationScopeMap implements Map {
+final class ServletApplicationScopeMap implements Map<String, Object> {
public ServletApplicationScopeMap(ServletContext context) {
@@ -48,26 +47,28 @@ final class ServletApplicationScopeMap i
private ServletContext context = null;
+ @Override
public void clear() {
- Iterator keys = keySet().iterator();
- while (keys.hasNext()) {
- context.removeAttribute((String) keys.next());
+ for (String key : keySet()) {
+ context.removeAttribute(key);
}
}
+ @Override
public boolean containsKey(Object key) {
return (context.getAttribute(key(key)) != null);
}
+ @Override
public boolean containsValue(Object value) {
if (value == null) {
return (false);
}
- Enumeration keys = context.getAttributeNames();
+ Enumeration<String> keys = context.getAttributeNames();
while (keys.hasMoreElements()) {
- Object next = context.getAttribute((String) keys.nextElement());
+ Object next = context.getAttribute(keys.nextElement());
if (value.equals(next)) {
return (true);
}
@@ -76,41 +77,47 @@ final class ServletApplicationScopeMap i
}
- public Set entrySet() {
- Set set = new HashSet();
- Enumeration keys = context.getAttributeNames();
+ @Override
+ public Set<Entry<String, Object>> entrySet() {
+ Set<Entry<String, Object>> set = new HashSet<Entry<String, Object>>();
+ Enumeration<String> keys = context.getAttributeNames();
String key;
while (keys.hasMoreElements()) {
- key = (String)keys.nextElement();
- set.add(new MapEntry(key, context.getAttribute(key), true));
+ key = keys.nextElement();
+ set.add(new MapEntry<String, Object>(key, context.getAttribute(key), true));
}
return (set);
}
+ @Override
public boolean equals(Object o) {
return (context.equals(o));
}
+ @Override
public Object get(Object key) {
return (context.getAttribute(key(key)));
}
+ @Override
public int hashCode() {
return (context.hashCode());
}
+ @Override
public boolean isEmpty() {
return (size() < 1);
}
- public Set keySet() {
- Set set = new HashSet();
- Enumeration keys = context.getAttributeNames();
+ @Override
+ public Set<String> keySet() {
+ Set<String> set = new HashSet<String>();
+ Enumeration<String> keys = context.getAttributeNames();
while (keys.hasMoreElements()) {
set.add(keys.nextElement());
}
@@ -118,26 +125,27 @@ final class ServletApplicationScopeMap i
}
- public Object put(Object key, Object value) {
+ @Override
+ public Object put(String key, Object value) {
if (value == null) {
return (remove(key));
}
- String skey = key(key);
- Object previous = context.getAttribute(skey);
- context.setAttribute(skey, value);
+ Object previous = context.getAttribute(key);
+ context.setAttribute(key, value);
return (previous);
}
- public void putAll(Map map) {
- Iterator entries = map.entrySet().iterator();
- while (entries.hasNext()) {
- Map.Entry entry = (Map.Entry)entries.next();
- put(entry.getKey(), entry.getValue());
+ @Override
+ public void putAll(Map<? extends String, ? extends Object> map) {
+
+ for (Entry<? extends String, ? extends Object> entry : map.entrySet()) {
+ put(key(entry.getKey()), entry.getValue());
}
}
+ @Override
public Object remove(Object key) {
String skey = key(key);
Object previous = context.getAttribute(skey);
@@ -146,9 +154,10 @@ final class ServletApplicationScopeMap i
}
+ @Override
public int size() {
int n = 0;
- Enumeration keys = context.getAttributeNames();
+ Enumeration<String> keys = context.getAttributeNames();
while (keys.hasMoreElements()) {
keys.nextElement();
n++;
@@ -157,11 +166,14 @@ final class ServletApplicationScopeMap i
}
- public Collection values() {
- List list = new ArrayList();
- Enumeration keys = context.getAttributeNames();
+ @Override
+ public Collection<Object> values() {
+ List<Object> list = new ArrayList<Object>();
+
+ Enumeration<String> keys = context.getAttributeNames();
+
while (keys.hasMoreElements()) {
- list.add(context.getAttribute((String) keys.nextElement()));
+ list.add(context.getAttribute(keys.nextElement()));
}
return (list);
}
Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletCookieMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletCookieMap.java?rev=1162332&r1=1162331&r2=1162332&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletCookieMap.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletCookieMap.java Sat Aug 27 12:34:14 2011
@@ -35,7 +35,7 @@ import org.apache.commons.chain.web.MapE
* @since Chain 1.1
*/
-final class ServletCookieMap implements Map {
+final class ServletCookieMap implements Map<String, Cookie> {
public ServletCookieMap(HttpServletRequest request) {
@@ -46,16 +46,19 @@ final class ServletCookieMap implements
private HttpServletRequest request = null;
+ @Override
public void clear() {
throw new UnsupportedOperationException();
}
+ @Override
public boolean containsKey(Object key) {
return (get(key) != null);
}
+ @Override
public boolean containsValue(Object value) {
Cookie[] cookies = request.getCookies();
if (cookies != null) {
@@ -69,24 +72,27 @@ final class ServletCookieMap implements
}
- public Set entrySet() {
- Set set = new HashSet();
+ @Override
+ public Set<Entry<String, Cookie>> entrySet() {
+ Set<Entry<String, Cookie>> set = new HashSet<Entry<String, Cookie>>();
Cookie[] cookies = request.getCookies();
if (cookies != null) {
for (int i = 0; i < cookies.length; i++) {
- set.add(new MapEntry(cookies[i].getName(), cookies[i], false));
+ set.add(new MapEntry<String, Cookie>(cookies[i].getName(), cookies[i], false));
}
}
return (set);
}
+ @Override
public boolean equals(Object o) {
return (request.equals(o));
}
- public Object get(Object key) {
+ @Override
+ public Cookie get(Object key) {
Cookie[] cookies = request.getCookies();
if (cookies != null) {
for (int i = 0; i < cookies.length; i++) {
@@ -99,18 +105,21 @@ final class ServletCookieMap implements
}
+ @Override
public int hashCode() {
return (request.hashCode());
}
+ @Override
public boolean isEmpty() {
return (size() < 1);
}
- public Set keySet() {
- Set set = new HashSet();
+ @Override
+ public Set<String> keySet() {
+ Set<String> set = new HashSet<String>();
Cookie[] cookies = request.getCookies();
if (cookies != null) {
for (int i = 0; i < cookies.length; i++) {
@@ -121,29 +130,33 @@ final class ServletCookieMap implements
}
- public Object put(Object key, Object value) {
+ @Override
+ public Cookie put(String key, Cookie value) {
throw new UnsupportedOperationException();
}
-
- public void putAll(Map map) {
+ @Override
+ public void putAll(Map<? extends String, ? extends Cookie> map) {
throw new UnsupportedOperationException();
}
- public Object remove(Object key) {
+ @Override
+ public Cookie remove(Object key) {
throw new UnsupportedOperationException();
}
+ @Override
public int size() {
Cookie[] cookies = request.getCookies();
return (cookies == null ? 0 : cookies.length);
}
- public Collection values() {
- List list = new ArrayList(size());
+ @Override
+ public Collection<Cookie> values() {
+ List<Cookie> list = new ArrayList<Cookie>(size());
Cookie[] cookies = request.getCookies();
if (cookies != null) {
for (int i = 0; i < cookies.length; i++) {
Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletGetLocaleCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletGetLocaleCommand.java?rev=1162332&r1=1162331&r2=1162332&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletGetLocaleCommand.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletGetLocaleCommand.java Sat Aug 27 12:34:14 2011
@@ -26,9 +26,12 @@ import org.apache.commons.chain.web.Abst
/**
* <p>Concrete implementation of {@link AbstractGetLocaleCommand} for
* the Servlet API.</p>
+ *
+ * @param <T> Type of the context associated with this command
+ *
*/
-public class ServletGetLocaleCommand extends AbstractGetLocaleCommand {
+public class ServletGetLocaleCommand<T extends Context> extends AbstractGetLocaleCommand<T> {
// ------------------------------------------------------- Protected Methods
@@ -40,7 +43,7 @@ public class ServletGetLocaleCommand ext
* @param context The {@link Context} we are operating on.
* @return The Locale for the request.
*/
- protected Locale getLocale(Context context) {
+ protected Locale getLocale(T context) {
HttpServletRequest request = (HttpServletRequest)
context.get("request");
Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletHeaderMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletHeaderMap.java?rev=1162332&r1=1162331&r2=1162332&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletHeaderMap.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletHeaderMap.java Sat Aug 27 12:34:14 2011
@@ -21,7 +21,6 @@ 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;
@@ -37,7 +36,7 @@ import org.apache.commons.chain.web.MapE
* @version $Revision$ $Date$
*/
-final class ServletHeaderMap implements Map {
+final class ServletHeaderMap implements Map<String, String> {
public ServletHeaderMap(HttpServletRequest request) {
@@ -48,62 +47,65 @@ final class ServletHeaderMap implements
private HttpServletRequest request = null;
+ @Override
public void clear() {
throw new UnsupportedOperationException();
}
+ @Override
public boolean containsKey(Object key) {
return (request.getHeader(key(key)) != null);
}
+ @Override
public boolean containsValue(Object value) {
- Iterator values = values().iterator();
- while (values.hasNext()) {
- if (value.equals(values.next())) {
- return (true);
- }
- }
- return (false);
+ return values().contains(value);
}
- public Set entrySet() {
- Set set = new HashSet();
- Enumeration keys = request.getHeaderNames();
+ @Override
+ public Set<Entry<String, String>> entrySet() {
+ Set<Entry<String, String>> set = new HashSet<Entry<String, String>>();
+ Enumeration<String> keys = request.getHeaderNames();
String key;
while (keys.hasMoreElements()) {
- key = (String) keys.nextElement();
- set.add(new MapEntry(key, request.getHeader(key), false));
+ key = keys.nextElement();
+ set.add(new MapEntry<String, String>(key, request.getHeader(key), false));
}
return (set);
}
+ @Override
public boolean equals(Object o) {
return (request.equals(o));
}
- public Object get(Object key) {
+ @Override
+ public String get(Object key) {
return (request.getHeader(key(key)));
}
+ @Override
public int hashCode() {
return (request.hashCode());
}
+ @Override
public boolean isEmpty() {
return (size() < 1);
}
- public Set keySet() {
- Set set = new HashSet();
- Enumeration keys = request.getHeaderNames();
+ @Override
+ public Set<String> keySet() {
+ Set<String> set = new HashSet<String>();
+ Enumeration<String> keys = request.getHeaderNames();
while (keys.hasMoreElements()) {
set.add(keys.nextElement());
}
@@ -111,21 +113,25 @@ final class ServletHeaderMap implements
}
- public Object put(Object key, Object value) {
+ @Override
+ public String put(String key, String value) {
throw new UnsupportedOperationException();
}
- public void putAll(Map map) {
+ @Override
+ public void putAll(Map<? extends String, ? extends String> map) {
throw new UnsupportedOperationException();
}
- public Object remove(Object key) {
+ @Override
+ public String remove(Object key) {
throw new UnsupportedOperationException();
}
+ @Override
public int size() {
int n = 0;
Enumeration keys = request.getHeaderNames();
@@ -137,11 +143,12 @@ final class ServletHeaderMap implements
}
- public Collection values() {
- List list = new ArrayList();
- Enumeration keys = request.getHeaderNames();
+ @Override
+ public Collection<String> values() {
+ List<String> list = new ArrayList<String>();
+ Enumeration<String> keys = request.getHeaderNames();
while (keys.hasMoreElements()) {
- list.add(request.getHeader((String) keys.nextElement()));
+ list.add(request.getHeader(keys.nextElement()));
}
return (list);
}
Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletHeaderValuesMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletHeaderValuesMap.java?rev=1162332&r1=1162331&r2=1162332&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletHeaderValuesMap.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletHeaderValuesMap.java Sat Aug 27 12:34:14 2011
@@ -21,7 +21,6 @@ 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;
@@ -37,7 +36,7 @@ import org.apache.commons.chain.web.MapE
* @version $Revision$ $Date$
*/
-final class ServletHeaderValuesMap implements Map {
+final class ServletHeaderValuesMap implements Map<String, String[]> {
public ServletHeaderValuesMap(HttpServletRequest request) {
@@ -48,24 +47,26 @@ final class ServletHeaderValuesMap imple
private HttpServletRequest request = null;
+ @Override
public void clear() {
throw new UnsupportedOperationException();
}
+ @Override
public boolean containsKey(Object key) {
return (request.getHeader(key(key)) != null);
}
+ @Override
public boolean containsValue(Object value) {
if (!(value instanceof String[])) {
return (false);
}
String[] test = (String[]) value;
- Iterator values = values().iterator();
- while (values.hasNext()) {
- String[] actual = (String[]) values.next();
+
+ for (String[] actual : values()) {
if (test.length == actual.length) {
boolean matched = true;
for (int i = 0; i < test.length; i++) {
@@ -79,50 +80,61 @@ final class ServletHeaderValuesMap imple
}
}
}
+
return (false);
}
- public Set entrySet() {
- Set set = new HashSet();
- Enumeration keys = request.getHeaderNames();
+ @Override
+ public Set<Entry<String, String[]>> entrySet() {
+ Set<Entry<String, String[]>> set = new HashSet<Entry<String, String[]>>();
+ Enumeration<String> keys = request.getHeaderNames();
String key;
while (keys.hasMoreElements()) {
- key = (String) keys.nextElement();
- set.add(new MapEntry(key, request.getHeaders(key), false));
+ key = keys.nextElement();
+ Enumeration<String> values = request.getHeaders(key);
+ String[] valuesArray = enumerationToArray(values);
+ /* Previously the API was returning an Set<Entry<String, Enumeration<String>>
+ * I'm assuming that this was a bug because it violates the contract of how the
+ * mapping class behaves. So, I fixed it right here.
+ */
+ set.add(new MapEntry<String, String[]>(key, valuesArray, false));
}
return (set);
}
+ @Override
public boolean equals(Object o) {
return (request.equals(o));
}
- public Object get(Object key) {
- List list = new ArrayList();
- Enumeration values = request.getHeaders(key(key));
- while (values.hasMoreElements()) {
- list.add((String) values.nextElement());
- }
- return (((String[]) list.toArray(new String[list.size()])));
+ @Override
+ public String[] get(Object key) {
+ Enumeration<String> values = request.getHeaders(key(key));
+ String[] valuesArray = enumerationToArray(values);
+
+ return valuesArray;
}
+ @Override
public int hashCode() {
return (request.hashCode());
}
+ @Override
public boolean isEmpty() {
return (size() < 1);
}
- public Set keySet() {
- Set set = new HashSet();
- Enumeration keys = request.getHeaderNames();
+ @Override
+ public Set<String> keySet() {
+ Set<String> set = new HashSet<String>();
+ Enumeration<String> keys = request.getHeaderNames();
while (keys.hasMoreElements()) {
set.add(keys.nextElement());
}
@@ -130,21 +142,25 @@ final class ServletHeaderValuesMap imple
}
- public Object put(Object key, Object value) {
+ @Override
+ public String[] put(String key, String[] value) {
throw new UnsupportedOperationException();
}
- public void putAll(Map map) {
+ @Override
+ public void putAll(Map<? extends String, ? extends String[]> map) {
throw new UnsupportedOperationException();
}
- public Object remove(Object key) {
+ @Override
+ public String[] remove(Object key) {
throw new UnsupportedOperationException();
}
+ @Override
public int size() {
int n = 0;
Enumeration keys = request.getHeaderNames();
@@ -156,21 +172,33 @@ final class ServletHeaderValuesMap imple
}
- public Collection values() {
- List list = new ArrayList();
- Enumeration keys = request.getHeaderNames();
+ @Override
+ public Collection<String[]> values() {
+ List<String[]> list = new ArrayList<String[]>();
+ Enumeration<String> keys = request.getHeaderNames();
while (keys.hasMoreElements()) {
- String key = (String) keys.nextElement();
- List list1 = new ArrayList();
- Enumeration values = request.getHeaders(key);
- while (values.hasMoreElements()) {
- list1.add((String) values.nextElement());
- }
- list.add(((String[]) list1.toArray(new String[list1.size()])));
+ String key = keys.nextElement();
+ Enumeration<String> values = request.getHeaders(key);
+ String[] valuesArray = enumerationToArray(values);
+ list.add(valuesArray);
}
return (list);
}
+ /**
+ * Simple utility method that converts a string enumeration into a string array.
+ * @param values enumeration of strings
+ * @return enumeration represented as a string array
+ */
+ private static String[] enumerationToArray(Enumeration<String> values) {
+ ArrayList<String> list = new ArrayList<String>();
+
+ while (values.hasMoreElements()) {
+ list.add(values.nextElement());
+ }
+
+ return list.toArray(new String[list.size()]);
+ }
private String key(Object key) {
if (key == null) {
Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletInitParamMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletInitParamMap.java?rev=1162332&r1=1162331&r2=1162332&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletInitParamMap.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletInitParamMap.java Sat Aug 27 12:34:14 2011
@@ -21,7 +21,6 @@ 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;
@@ -37,7 +36,7 @@ import org.apache.commons.chain.web.MapE
* @version $Revision$ $Date$
*/
-final class ServletInitParamMap implements Map {
+final class ServletInitParamMap implements Map<String, String> {
public ServletInitParamMap(ServletContext context) {
@@ -48,87 +47,94 @@ final class ServletInitParamMap implemen
private ServletContext context = null;
+ @Override
public void clear() {
throw new UnsupportedOperationException();
}
+ @Override
public boolean containsKey(Object key) {
return (context.getInitParameter(key(key)) != null);
}
+ @Override
public boolean containsValue(Object value) {
- Iterator values = values().iterator();
- while (values.hasNext()) {
- if (value.equals(values.next())) {
- return (true);
- }
- }
- return (false);
+ return values().contains(value);
}
- public Set entrySet() {
- Set set = new HashSet();
- Enumeration keys = context.getInitParameterNames();
+ @Override
+ public Set<Entry<String, String>> entrySet() {
+ Set<Entry<String, String>> set = new HashSet<Entry<String, String>>();
+ Enumeration<String> keys = context.getInitParameterNames();
String key;
while (keys.hasMoreElements()) {
- key = (String) keys.nextElement();
- set.add(new MapEntry(key, context.getInitParameter(key), false));
+ key = keys.nextElement();
+ set.add(new MapEntry<String, String>(key, context.getInitParameter(key), false));
}
return (set);
}
+ @Override
public boolean equals(Object o) {
return (context.equals(o));
}
- public Object get(Object key) {
+ @Override
+ public String get(Object key) {
return (context.getInitParameter(key(key)));
}
+ @Override
public int hashCode() {
return (context.hashCode());
}
+ @Override
public boolean isEmpty() {
return (size() < 1);
}
- public Set keySet() {
- Set set = new HashSet();
- Enumeration keys = context.getInitParameterNames();
+ @Override
+ public Set<String> keySet() {
+ Set<String> set = new HashSet<String>();
+ Enumeration<String> keys = context.getInitParameterNames();
+
while (keys.hasMoreElements()) {
set.add(keys.nextElement());
}
return (set);
}
-
- public Object put(Object key, Object value) {
+ @Override
+ public String put(String key, String value) {
throw new UnsupportedOperationException();
}
- public void putAll(Map map) {
+ @Override
+ public void putAll(Map<? extends String, ? extends String> map) {
throw new UnsupportedOperationException();
}
- public Object remove(Object key) {
+ @Override
+ public String remove(Object key) {
throw new UnsupportedOperationException();
}
+ @Override
public int size() {
int n = 0;
- Enumeration keys = context.getInitParameterNames();
+ Enumeration<String> keys = context.getInitParameterNames();
while (keys.hasMoreElements()) {
keys.nextElement();
n++;
@@ -137,11 +143,12 @@ final class ServletInitParamMap implemen
}
- public Collection values() {
- List list = new ArrayList();
- Enumeration keys = context.getInitParameterNames();
+ @Override
+ public Collection<String> values() {
+ List<String> list = new ArrayList<String>();
+ Enumeration<String> keys = context.getInitParameterNames();
while (keys.hasMoreElements()) {
- list.add(context.getInitParameter((String) keys.nextElement()));
+ list.add(context.getInitParameter(keys.nextElement()));
}
return (list);
}
Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletParamMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletParamMap.java?rev=1162332&r1=1162331&r2=1162332&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletParamMap.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletParamMap.java Sat Aug 27 12:34:14 2011
@@ -21,7 +21,6 @@ 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;
@@ -37,7 +36,7 @@ import org.apache.commons.chain.web.MapE
* @version $Revision$ $Date$
*/
-final class ServletParamMap implements Map {
+final class ServletParamMap implements Map<String, String> {
public ServletParamMap(HttpServletRequest request) {
@@ -48,62 +47,65 @@ final class ServletParamMap implements M
private HttpServletRequest request = null;
+ @Override
public void clear() {
throw new UnsupportedOperationException();
}
+ @Override
public boolean containsKey(Object key) {
return (request.getParameter(key(key)) != null);
}
+ @Override
public boolean containsValue(Object value) {
- Iterator values = values().iterator();
- while (values.hasNext()) {
- if (value.equals(values.next())) {
- return (true);
- }
- }
- return (false);
+ return values().contains(value);
}
- public Set entrySet() {
- Set set = new HashSet();
- Enumeration keys = request.getParameterNames();
+ @Override
+ public Set<Entry<String, String>> entrySet() {
+ Set<Entry<String, String>> set = new HashSet<Entry<String, String>>();
+ Enumeration<String> keys = request.getParameterNames();
String key;
while (keys.hasMoreElements()) {
- key = (String)keys.nextElement();
- set.add(new MapEntry(key, request.getParameter(key), false));
+ key = keys.nextElement();
+ set.add(new MapEntry<String, String>(key, request.getParameter(key), false));
}
return (set);
}
+ @Override
public boolean equals(Object o) {
return (request.equals(o));
}
- public Object get(Object key) {
+ @Override
+ public String get(Object key) {
return (request.getParameter(key(key)));
}
+ @Override
public int hashCode() {
return (request.hashCode());
}
+ @Override
public boolean isEmpty() {
return (size() < 1);
}
- public Set keySet() {
- Set set = new HashSet();
- Enumeration keys = request.getParameterNames();
+ @Override
+ public Set<String> keySet() {
+ Set<String> set = new HashSet<String>();
+ Enumeration<String> keys = request.getParameterNames();
while (keys.hasMoreElements()) {
set.add(keys.nextElement());
}
@@ -111,24 +113,28 @@ final class ServletParamMap implements M
}
- public Object put(Object key, Object value) {
+ @Override
+ public String put(String key, String value) {
throw new UnsupportedOperationException();
}
- public void putAll(Map map) {
+ @Override
+ public void putAll(Map<? extends String, ? extends String> map) {
throw new UnsupportedOperationException();
}
- public Object remove(Object key) {
+ @Override
+ public String remove(Object key) {
throw new UnsupportedOperationException();
}
+ @Override
public int size() {
int n = 0;
- Enumeration keys = request.getParameterNames();
+ Enumeration<String> keys = request.getParameterNames();
while (keys.hasMoreElements()) {
keys.nextElement();
n++;
@@ -137,11 +143,12 @@ final class ServletParamMap implements M
}
- public Collection values() {
- List list = new ArrayList();
- Enumeration keys = request.getParameterNames();
+ @Override
+ public Collection<String> values() {
+ List<String> list = new ArrayList<String>();
+ Enumeration<String> keys = request.getParameterNames();
while (keys.hasMoreElements()) {
- list.add(request.getParameter((String) keys.nextElement()));
+ list.add(request.getParameter(keys.nextElement()));
}
return (list);
}
Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletParamValuesMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletParamValuesMap.java?rev=1162332&r1=1162331&r2=1162332&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletParamValuesMap.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletParamValuesMap.java Sat Aug 27 12:34:14 2011
@@ -21,7 +21,6 @@ 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;
@@ -37,7 +36,7 @@ import org.apache.commons.chain.web.MapE
* @version $Revision$ $Date$
*/
-final class ServletParamValuesMap implements Map {
+final class ServletParamValuesMap implements Map<String, String[]> {
public ServletParamValuesMap(HttpServletRequest request) {
@@ -48,62 +47,65 @@ final class ServletParamValuesMap implem
private HttpServletRequest request = null;
+ @Override
public void clear() {
throw new UnsupportedOperationException();
}
+ @Override
public boolean containsKey(Object key) {
return (request.getParameter(key(key)) != null);
}
+ @Override
public boolean containsValue(Object value) {
- Iterator values = values().iterator();
- while (values.hasNext()) {
- if (value.equals(values.next())) {
- return (true);
- }
- }
- return (false);
+ return values().contains(value);
}
- public Set entrySet() {
- Set set = new HashSet();
- Enumeration keys = request.getParameterNames();
+ @Override
+ public Set<Entry<String, String[]>> entrySet() {
+ Set<Entry<String, String[]>> set = new HashSet<Entry<String, String[]>>();
+ Enumeration<String> keys = request.getParameterNames();
String key;
while (keys.hasMoreElements()) {
- key = (String) keys.nextElement();
- set.add(new MapEntry(key, request.getParameterValues(key), false));
+ key = keys.nextElement();
+ set.add(new MapEntry<String, String[]>(key, request.getParameterValues(key), false));
}
return (set);
}
+ @Override
public boolean equals(Object o) {
return (request.equals(o));
}
- public Object get(Object key) {
+ @Override
+ public String[] get(Object key) {
return (request.getParameterValues(key(key)));
}
+ @Override
public int hashCode() {
return (request.hashCode());
}
+ @Override
public boolean isEmpty() {
return (size() < 1);
}
- public Set keySet() {
- Set set = new HashSet();
- Enumeration keys = request.getParameterNames();
+ @Override
+ public Set<String> keySet() {
+ Set<String> set = new HashSet<String>();
+ Enumeration<String> keys = request.getParameterNames();
while (keys.hasMoreElements()) {
set.add(keys.nextElement());
}
@@ -111,24 +113,28 @@ final class ServletParamValuesMap implem
}
- public Object put(Object key, Object value) {
+ @Override
+ public String[] put(String key, String[] value) {
throw new UnsupportedOperationException();
}
- public void putAll(Map map) {
+ @Override
+ public void putAll(Map<? extends String, ? extends String[]> map) {
throw new UnsupportedOperationException();
}
- public Object remove(Object key) {
+ @Override
+ public String[] remove(Object key) {
throw new UnsupportedOperationException();
}
+ @Override
public int size() {
int n = 0;
- Enumeration keys = request.getParameterNames();
+ Enumeration<String> keys = request.getParameterNames();
while (keys.hasMoreElements()) {
keys.nextElement();
n++;
@@ -137,9 +143,10 @@ final class ServletParamValuesMap implem
}
- public Collection values() {
- List list = new ArrayList();
- Enumeration keys = request.getParameterNames();
+ @Override
+ public Collection<String[]> values() {
+ List<String[]> list = new ArrayList();
+ Enumeration<String> keys = request.getParameterNames();
while (keys.hasMoreElements()) {
list.add(request.getParameterValues((String) keys.nextElement()));
}
Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletPathMapper.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletPathMapper.java?rev=1162332&r1=1162331&r2=1162332&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletPathMapper.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletPathMapper.java Sat Aug 27 12:34:14 2011
@@ -117,6 +117,7 @@ public class ServletPathMapper extends L
*
* @since Chain 1.2
*/
+ @Override
protected Catalog getCatalog(Context context) {
Catalog catalog = (Catalog) context.get(getCatalogKey());
if (catalog == null) {
Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletRequestScopeMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletRequestScopeMap.java?rev=1162332&r1=1162331&r2=1162332&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletRequestScopeMap.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletRequestScopeMap.java Sat Aug 27 12:34:14 2011
@@ -21,7 +21,6 @@ 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;
@@ -37,7 +36,7 @@ import org.apache.commons.chain.web.MapE
* @version $Revision$ $Date$
*/
-final class ServletRequestScopeMap implements Map {
+final class ServletRequestScopeMap implements Map<String, Object> {
public ServletRequestScopeMap(HttpServletRequest request) {
@@ -48,26 +47,28 @@ final class ServletRequestScopeMap imple
private HttpServletRequest request = null;
+ @Override
public void clear() {
- Iterator keys = keySet().iterator();
- while (keys.hasNext()) {
- request.removeAttribute((String) keys.next());
+ for (String key : keySet()) {
+ request.removeAttribute(key);
}
}
+ @Override
public boolean containsKey(Object key) {
return (request.getAttribute(key(key)) != null);
}
+ @Override
public boolean containsValue(Object value) {
if (value == null) {
return (false);
}
- Enumeration keys = request.getAttributeNames();
+ Enumeration<String> keys = request.getAttributeNames();
while (keys.hasMoreElements()) {
- Object next = request.getAttribute((String) keys.nextElement());
+ Object next = request.getAttribute(keys.nextElement());
if (value.equals(next)) {
return (true);
}
@@ -76,41 +77,47 @@ final class ServletRequestScopeMap imple
}
- public Set entrySet() {
- Set set = new HashSet();
- Enumeration keys = request.getAttributeNames();
+ @Override
+ public Set<Entry<String, Object>> entrySet() {
+ Set<Entry<String, Object>> set = new HashSet<Entry<String, Object>>();
+ Enumeration<String> keys = request.getAttributeNames();
String key;
while (keys.hasMoreElements()) {
- key = (String) keys.nextElement();
- set.add(new MapEntry(key, request.getAttribute(key), true));
+ key = keys.nextElement();
+ set.add(new MapEntry<String, Object>(key, request.getAttribute(key), true));
}
return (set);
}
+ @Override
public boolean equals(Object o) {
return (request.equals(o));
}
+ @Override
public Object get(Object key) {
return (request.getAttribute(key(key)));
}
+ @Override
public int hashCode() {
return (request.hashCode());
}
+ @Override
public boolean isEmpty() {
return (size() < 1);
}
- public Set keySet() {
- Set set = new HashSet();
- Enumeration keys = request.getAttributeNames();
+ @Override
+ public Set<String> keySet() {
+ Set<String> set = new HashSet<String>();
+ Enumeration<String> keys = request.getAttributeNames();
while (keys.hasMoreElements()) {
set.add(keys.nextElement());
}
@@ -118,26 +125,27 @@ final class ServletRequestScopeMap imple
}
- public Object put(Object key, Object value) {
+ @Override
+ public Object put(String key, Object value) {
if (value == null) {
return (remove(key));
}
- String skey = key(key);
- Object previous = request.getAttribute(skey);
- request.setAttribute(skey, value);
+ Object previous = request.getAttribute(key);
+ request.setAttribute(key, value);
return (previous);
}
- public void putAll(Map map) {
- Iterator entries = map.entrySet().iterator();
- while (entries.hasNext()) {
- Map.Entry entry = (Map.Entry)entries.next();
- put(entry.getKey(), entry.getValue());
+ @Override
+ public void putAll(Map<? extends String, ? extends Object> map) {
+ for (Entry<? extends String, ? extends Object> entry : map.entrySet()) {
+ put(key(entry.getKey()), entry.getValue());
}
+
}
+ @Override
public Object remove(Object key) {
String skey = key(key);
Object previous = request.getAttribute(skey);
@@ -146,6 +154,7 @@ final class ServletRequestScopeMap imple
}
+ @Override
public int size() {
int n = 0;
Enumeration keys = request.getAttributeNames();
@@ -157,11 +166,12 @@ final class ServletRequestScopeMap imple
}
- public Collection values() {
- List list = new ArrayList();
- Enumeration keys = request.getAttributeNames();
+ @Override
+ public Collection<Object> values() {
+ List<Object> list = new ArrayList<Object>();
+ Enumeration<String> keys = request.getAttributeNames();
while (keys.hasMoreElements()) {
- list.add(request.getAttribute((String) keys.nextElement()));
+ list.add(request.getAttribute(keys.nextElement()));
}
return (list);
}