commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simonetrip...@apache.org
Subject svn commit: r1163728 [1/2] - in /commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain: ./ config/ generic/ impl/ web/ web/faces/ web/portlet/ web/servlet/
Date Wed, 31 Aug 2011 18:11:37 GMT
Author: simonetripodi
Date: Wed Aug 31 18:11:36 2011
New Revision: 1163728

URL: http://svn.apache.org/viewvc?rev=1163728&view=rev
Log:
removed @Override annotation for interfaces methods implementation

Modified:
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/Chain.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/config/ConfigCatalogRule.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/config/ConfigDefineRule.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/config/ConfigRegisterRule.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/generic/CopyCommand.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/generic/DispatchLookupCommand.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/generic/LookupCommand.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/impl/CatalogBase.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/impl/CatalogFactoryBase.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/impl/ChainBase.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/impl/ContextBase.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/AbstractGetLocaleCommand.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/ChainListener.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/ChainServlet.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/MapEntry.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/faces/FacesGetLocaleCommand.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/faces/FacesWebContext.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletApplicationScopeMap.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletInitParamMap.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletParamMap.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletParamValuesMap.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletRequestScopeMap.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletSessionScopeMap.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletWebContext.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ChainProcessor.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/PathInfoMapper.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/RequestParameterMapper.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletApplicationScopeMap.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletCookieMap.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletHeaderMap.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletHeaderValuesMap.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletInitParamMap.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletParamMap.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletParamValuesMap.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletPathMapper.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletRequestScopeMap.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletSessionScopeMap.java
    commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletWebContext.java

Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/Chain.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/Chain.java?rev=1163728&r1=1163727&r2=1163728&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/Chain.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/Chain.java Wed Aug 31 18:11:36 2011
@@ -114,7 +114,6 @@ public interface Chain<C extends Context
      *  of this {@link Context} should be delegated to a subsequent
      *  {@link Command} in an enclosing {@link Chain}
      */
-    @Override
     boolean execute(C context) throws Exception;
 
 

Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/config/ConfigCatalogRule.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/config/ConfigCatalogRule.java?rev=1163728&r1=1163727&r2=1163728&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/config/ConfigCatalogRule.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/config/ConfigCatalogRule.java Wed Aug 31 18:11:36 2011
@@ -89,7 +89,6 @@ class ConfigCatalogRule extends Rule {
      *   the element name otherwise
      * @param attributes The attribute list of this element
      */
-    @Override
     public void begin(String namespace, String name, Attributes attributes)
         throws Exception {
 

Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/config/ConfigDefineRule.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/config/ConfigDefineRule.java?rev=1163728&r1=1163727&r2=1163728&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/config/ConfigDefineRule.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/config/ConfigDefineRule.java Wed Aug 31 18:11:36 2011
@@ -86,7 +86,6 @@ class ConfigDefineRule extends Rule {
      *   the element name otherwise
      * @param attributes The attribute list of this element
      */
-    @Override
     public void begin(String namespace, String name, Attributes attributes)
         throws Exception {
 

Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/config/ConfigRegisterRule.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/config/ConfigRegisterRule.java?rev=1163728&r1=1163727&r2=1163728&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/config/ConfigRegisterRule.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/config/ConfigRegisterRule.java Wed Aug 31 18:11:36 2011
@@ -77,7 +77,6 @@ class ConfigRegisterRule extends Rule {
      *   the element name otherwise
      * @param attributes The attribute list of this element
      */
-    @Override
     public void begin(String namespace, String name, Attributes attributes)
         throws Exception {
 

Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/generic/CopyCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/generic/CopyCommand.java?rev=1163728&r1=1163727&r2=1163728&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/generic/CopyCommand.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/generic/CopyCommand.java Wed Aug 31 18:11:36 2011
@@ -127,7 +127,6 @@ public class CopyCommand<C extends Conte
      * @return <code>false</code> so that processing will continue
      * @throws Exception in the if an error occurs during execution.
      */
-    @Override
     public boolean execute(C context) throws Exception {
 
         Object value = this.value;

Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/generic/DispatchLookupCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/generic/DispatchLookupCommand.java?rev=1163728&r1=1163727&r2=1163728&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/generic/DispatchLookupCommand.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/generic/DispatchLookupCommand.java Wed Aug 31 18:11:36 2011
@@ -139,7 +139,6 @@ public class DispatchLookupCommand<C ext
      * @throws Exception if no such {@link Command} can be found and the
      *  <code>optional</code> property is set to <code>false</code>
      */
-    @Override
     public boolean execute(C context) throws Exception {
 
         if (this.getMethod() == null && this.getMethodKey() == null) {

Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/generic/LookupCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/generic/LookupCommand.java?rev=1163728&r1=1163727&r2=1163728&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/generic/LookupCommand.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/generic/LookupCommand.java Wed Aug 31 18:11:36 2011
@@ -300,7 +300,6 @@ public class LookupCommand<C extends Con
      * instance is <code>true</code>
      * @throws Exception if and error occurs in the looked-up Command.
      */
-    @Override
     public boolean execute(C context) throws Exception {
 
         Command command = getCommand(context);
@@ -330,7 +329,6 @@ public class LookupCommand<C extends Con
      * unless the <code>optional</code> property is <code>false</code>, in which
      * case <code>IllegalArgumentException</code> will be thrown.
      */
-    @Override
     public boolean postprocess(C context, Exception exception) {
 
         Command command = getCommand(context);

Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/impl/CatalogBase.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/impl/CatalogBase.java?rev=1163728&r1=1163727&r2=1163728&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/impl/CatalogBase.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/impl/CatalogBase.java Wed Aug 31 18:11:36 2011
@@ -78,7 +78,6 @@ public class CatalogBase implements Cata
      * @param command {@link Command} to be returned
      *  for later lookups on this name
      */
-    @Override
     public void addCommand(String name, Command command) {
 
         commands.put(name, command);
@@ -93,7 +92,6 @@ public class CatalogBase implements Cata
      *  should be retrieved
      * @return The Command associated with the specified name.
      */
-    @Override
     public Command getCommand(String name) {
 
         return commands.get(name);
@@ -107,7 +105,6 @@ public class CatalogBase implements Cata
      * an empty Iterator is returned.</p>
      * @return An iterator of the names in this Catalog.
      */
-    @Override
     public Iterator<String> getNames() {
 
         return commands.keySet().iterator();
@@ -118,7 +115,6 @@ public class CatalogBase implements Cata
      * Converts this Catalog to a String.  Useful for debugging purposes.
      * @return a representation of this catalog as a String
      */
-    @Override
     public String toString() {
 
         Iterator names = getNames();

Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/impl/CatalogFactoryBase.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/impl/CatalogFactoryBase.java?rev=1163728&r1=1163727&r2=1163728&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/impl/CatalogFactoryBase.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/impl/CatalogFactoryBase.java Wed Aug 31 18:11:36 2011
@@ -68,7 +68,6 @@ public class CatalogFactoryBase extends 
      *
      * @return the default Catalog instance
      */
-    @Override
     public Catalog getCatalog() {
 
         return catalog;
@@ -81,7 +80,6 @@ public class CatalogFactoryBase extends 
      *
      * @param catalog the default Catalog instance
      */
-    @Override
     public void setCatalog(Catalog catalog) {
 
         this.catalog = catalog;
@@ -96,7 +94,6 @@ public class CatalogFactoryBase extends 
      * @param name the name of the Catalog to retrieve
      * @return the specified Catalog
      */
-    @Override
     public Catalog getCatalog(String name) {
 
         return catalogs.get(name);
@@ -111,7 +108,6 @@ public class CatalogFactoryBase extends 
      * @param name the name of the Catalog to add
      * @param catalog the Catalog to add
      */
-    @Override
     public void addCatalog(String name, Catalog catalog) {
 
             catalogs.put(name, catalog);
@@ -125,7 +121,6 @@ public class CatalogFactoryBase extends 
      * If there are no known catalogs, an empty Iterator is returned.</p>
      * @return An Iterator of the names of the Catalogs known by this factory.
      */
-    @Override
     public Iterator<String> getNames() {
 
             return catalogs.keySet().iterator();

Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/impl/ChainBase.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/impl/ChainBase.java?rev=1163728&r1=1163727&r2=1163728&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/impl/ChainBase.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/impl/ChainBase.java Wed Aug 31 18:11:36 2011
@@ -139,7 +139,6 @@ public class ChainBase<C extends Context
      *  is <code>null</code>
      * @exception IllegalStateException if no further configuration is allowed
      */
-    @Override
     public void addCommand(Command<C> command) {
 
         if (command == null) {
@@ -173,7 +172,6 @@ public class ChainBase<C extends Context
      *  of this {@link Context} should be delegated to a subsequent
      *  {@link Command} in an enclosing {@link Chain}
      */
-    @Override
     public boolean execute(C context) throws Exception {
 
         // Verify our parameters

Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/impl/ContextBase.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/impl/ContextBase.java?rev=1163728&r1=1163727&r2=1163728&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/impl/ContextBase.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/impl/ContextBase.java Wed Aug 31 18:11:36 2011
@@ -147,7 +147,6 @@ public class ContextBase extends Concurr
      * <p>Override the default <code>Map</code> behavior to clear all keys and
      * values except those corresponding to JavaBeans properties.</p>
      */
-    @Override
     public void clear() {
 
         if (descriptors == null) {
@@ -176,7 +175,6 @@ public class ContextBase extends Concurr
      * @exception IllegalArgumentException if a property getter
      *  throws an exception
      */
-    @Override
     public boolean containsValue(Object value) {
 
         // Case 1 -- no local properties
@@ -216,7 +214,6 @@ public class ContextBase extends Concurr
      *
      * @return Set of entries in the Context.
      */
-    @Override
     public Set<Entry<String, Object>> entrySet() {
 
         return (new EntrySetImpl());
@@ -242,7 +239,6 @@ public class ContextBase extends Concurr
      * @exception UnsupportedOperationException if this local property does not
      *  have a read method.
      */
-    @Override
     public Object get(Object key) {
 
         // Case 1 -- no local properties
@@ -277,7 +273,6 @@ public class ContextBase extends Concurr
      * @return <code>true</code> if this Context is empty, otherwise
      *  <code>false</code>.
      */
-    @Override
     public boolean isEmpty() {
 
         // Case 1 -- no local properties
@@ -300,7 +295,6 @@ public class ContextBase extends Concurr
      *
      * @return The set of keys for objects in this Context.
      */
-    @Override
     public Set<String> keySet() {
 
 
@@ -323,7 +317,6 @@ public class ContextBase extends Concurr
      * @exception UnsupportedOperationException if this local property does not
      *  have both a read method and a write method
      */
-    @Override
     public Object put(String key, Object value) {
 
         // Case 1 -- no local properties
@@ -364,7 +357,6 @@ public class ContextBase extends Concurr
      * @exception UnsupportedOperationException if a local property does not
      *  have both a read method and a write method
      */
-    @Override
     public void putAll(Map<? extends String, ? extends Object> map) {
 
         for (Entry<? extends String, ? extends Object> pair : map.entrySet()) {
@@ -385,7 +377,6 @@ public class ContextBase extends Concurr
      * @exception UnsupportedOperationException if the specified
      *  <code>key</code> matches the name of a local property
      */
-    @Override
     public Object remove(Object key) {
 
         // Case 1 -- no local properties
@@ -418,7 +409,6 @@ public class ContextBase extends Concurr
      *
      * @return The collection of values in this Context.
      */
-    @Override
     public Collection<Object> values() {
 
         return (new ValuesImpl());
@@ -602,13 +592,11 @@ public class ContextBase extends Concurr
      */
     private class EntrySetImpl extends AbstractSet<Entry<String, Object>> {
 
-        @Override
-        public void clear() {
+            public void clear() {
             ContextBase.this.clear();
         }
 
-        @Override
-        public boolean contains(Object obj) {
+            public boolean contains(Object obj) {
             if (!(obj instanceof Map.Entry)) {
                 return (false);
             }
@@ -621,18 +609,15 @@ public class ContextBase extends Concurr
             }
         }
 
-        @Override
-        public boolean isEmpty() {
+            public boolean isEmpty() {
             return (ContextBase.this.isEmpty());
         }
 
-        @Override
-        public Iterator<Entry<String, Object>> iterator() {
+            public Iterator<Entry<String, Object>> iterator() {
             return (ContextBase.this.entriesIterator());
         }
 
-        @Override
-        public boolean remove(Object obj) {
+            public boolean remove(Object obj) {
             if (obj instanceof Map.Entry) {
                 return (ContextBase.this.remove((Map.Entry<String, Object>) obj));
             } else {
@@ -640,8 +625,7 @@ public class ContextBase extends Concurr
             }
         }
 
-        @Override
-        public int size() {
+            public int size() {
             return (ContextBase.this.size());
         }
 
@@ -657,18 +641,15 @@ public class ContextBase extends Concurr
         private Map.Entry<String, Object> entry = null;
         private Iterator<String> keys = ContextBase.this.keySet().iterator();
 
-        @Override
         public boolean hasNext() {
             return (keys.hasNext());
         }
 
-        @Override
         public Entry<String, Object> next() {
             entry = ContextBase.this.entry(keys.next());
             return (entry);
         }
 
-        @Override
         public void remove() {
             ContextBase.this.remove(entry);
         }
@@ -690,8 +671,7 @@ public class ContextBase extends Concurr
         private String key;
         private Object value;
 
-        @Override
-        public boolean equals(Object obj) {
+            public boolean equals(Object obj) {
             if (obj == null) {
                 return (false);
             } else if (!(obj instanceof Map.Entry)) {
@@ -712,23 +692,19 @@ public class ContextBase extends Concurr
             }
         }
 
-        @Override
         public String getKey() {
             return (this.key);
         }
 
-        @Override
         public Object getValue() {
             return (this.value);
         }
 
-        @Override
         public int hashCode() {
             return (((key == null) ? 0 : key.hashCode())
                    ^ ((value == null) ? 0 : value.hashCode()));
         }
 
-        @Override
         public Object setValue(Object value) {
             Object previous = this.value;
             ContextBase.this.put(this.key, value);
@@ -736,8 +712,7 @@ public class ContextBase extends Concurr
             return (previous);
         }
 
-        @Override
-        public String toString() {
+            public String toString() {
             return getKey() + "=" + getValue();
         }
     }
@@ -749,13 +724,11 @@ public class ContextBase extends Concurr
      */
     private class ValuesImpl extends AbstractCollection<Object> {
 
-        @Override
-        public void clear() {
+            public void clear() {
             ContextBase.this.clear();
         }
 
-        @Override
-        public boolean contains(Object obj) {
+            public boolean contains(Object obj) {
             if (!(obj instanceof Map.Entry)) {
                 return (false);
             }
@@ -763,18 +736,15 @@ public class ContextBase extends Concurr
             return (ContextBase.this.containsValue(entry.getValue()));
         }
 
-        @Override
-        public boolean isEmpty() {
+            public boolean isEmpty() {
             return (ContextBase.this.isEmpty());
         }
 
-        @Override
-        public Iterator<Object> iterator() {
+            public Iterator<Object> iterator() {
             return (ContextBase.this.valuesIterator());
         }
 
-        @Override
-        public boolean remove(Object obj) {
+            public boolean remove(Object obj) {
             if (obj instanceof Map.Entry) {
                 return (ContextBase.this.remove((Map.Entry) obj));
             } else {
@@ -782,8 +752,7 @@ public class ContextBase extends Concurr
             }
         }
 
-        @Override
-        public int size() {
+            public int size() {
             return (ContextBase.this.size());
         }
 
@@ -799,18 +768,15 @@ public class ContextBase extends Concurr
         private Map.Entry<String, Object> entry = null;
         private Iterator<String> keys = ContextBase.this.keySet().iterator();
 
-        @Override
         public boolean hasNext() {
             return (keys.hasNext());
         }
 
-        @Override
         public Object next() {
             entry = ContextBase.this.entry(keys.next());
             return (entry.getValue());
         }
 
-        @Override
         public void remove() {
             ContextBase.this.remove(entry);
         }

Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/AbstractGetLocaleCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/AbstractGetLocaleCommand.java?rev=1163728&r1=1163727&r2=1163728&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/AbstractGetLocaleCommand.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/AbstractGetLocaleCommand.java Wed Aug 31 18:11:36 2011
@@ -83,7 +83,6 @@ public abstract class AbstractGetLocaleC
      * @return <code>false</code> so that processng will continue
      * @throws Exception If an error occurs during execution.
      */
-    @Override
     public boolean execute(C context) throws Exception {
 
     context.put(getLocaleKey(), getLocale(context));

Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/ChainListener.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/ChainListener.java?rev=1163728&r1=1163727&r2=1163728&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/ChainListener.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/ChainListener.java Wed Aug 31 18:11:36 2011
@@ -164,7 +164,6 @@ public class ChainListener implements Se
      *
      * @param event <code>ServletContextEvent</code> to be processed
      */
-    @Override
     public void contextInitialized(ServletContextEvent event) {
 
         Log log = LogFactory.getLog(ChainListener.class);

Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/ChainServlet.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/ChainServlet.java?rev=1163728&r1=1163727&r2=1163728&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/ChainServlet.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/ChainServlet.java Wed Aug 31 18:11:36 2011
@@ -139,7 +139,6 @@ public class ChainServlet extends HttpSe
     /**
      * <p>Clean up after ourselves as this application shuts down.</p>
      */
-    @Override
     public void destroy() {
 
         ServletConfig config = getServletConfig();
@@ -159,7 +158,6 @@ public class ChainServlet extends HttpSe
      *
      * @throws ServletException if the servlet could not be initialized
      */
-    @Override
     public void init() throws ServletException {
 
         Log log = LogFactory.getLog(ChainServlet.class);
@@ -234,7 +232,6 @@ public class ChainServlet extends HttpSe
      * @throws javax.servlet.ServletException (this exception is never thrown)
      * @throws java.io.IOException (this exception is never thrown)
      */
-    @Override
     public void service(HttpServletRequest request,
                         HttpServletResponse response)
         throws ServletException, IOException {

Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/MapEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/MapEntry.java?rev=1163728&r1=1163727&r2=1163728&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/MapEntry.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/MapEntry.java Wed Aug 31 18:11:36 2011
@@ -68,7 +68,6 @@ public class MapEntry<K, V> implements M
      *
      * @return The entry key
      */
-    @Override
     public K getKey() {
         return key;
     }
@@ -79,7 +78,6 @@ public class MapEntry<K, V> implements M
      *
      * @return The entry key
      */
-    @Override
     public V getValue() {
         return value;
     }
@@ -92,7 +90,6 @@ public class MapEntry<K, V> implements M
      * @return The old entry value
      * @throws UnsupportedOperationException If the entry cannot be modified
      */
-    @Override
     public V setValue(V val) {
         if (modifiable) {
             V oldVal = this.value;
@@ -110,7 +107,6 @@ public class MapEntry<K, V> implements M
      * @param o The object to test
      * @return True if equal, else false
      */
-    @Override
     public boolean equals(Object o) {
         if (o != null && o instanceof Map.Entry) {
             Map.Entry entry = (Map.Entry)o;
@@ -128,7 +124,6 @@ public class MapEntry<K, V> implements M
      *
      * @return The and'ed hashcode of the key and value
      */
-    @Override
     public int hashCode() {
         return (this.getKey() == null   ? 0 : this.getKey().hashCode()) ^
                (this.getValue() == null ? 0 : this.getValue().hashCode());

Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/faces/FacesGetLocaleCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/faces/FacesGetLocaleCommand.java?rev=1163728&r1=1163727&r2=1163728&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/faces/FacesGetLocaleCommand.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/faces/FacesGetLocaleCommand.java Wed Aug 31 18:11:36 2011
@@ -42,7 +42,6 @@ public class FacesGetLocaleCommand<C ext
      * @param context The {@link Context} we are operating on.
      * @return The Locale for the request.
      */
-    @Override
     protected Locale getLocale(C context) {
 
     FacesContext fcontext = (FacesContext)

Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/faces/FacesWebContext.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/faces/FacesWebContext.java?rev=1163728&r1=1163727&r2=1163728&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/faces/FacesWebContext.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/faces/FacesWebContext.java Wed Aug 31 18:11:36 2011
@@ -122,7 +122,6 @@ public class FacesWebContext extends Web
      *
      * @return Application scope Map.
      */
-    @Override
     public Map<String, Object> getApplicationScope() {
 
     return (context.getExternalContext().getApplicationMap());
@@ -135,7 +134,6 @@ public class FacesWebContext extends Web
      *
      * @return Header values Map.
      */
-    @Override
     public Map<String, String> getHeader() {
 
     return (context.getExternalContext().getRequestHeaderMap());
@@ -148,7 +146,6 @@ public class FacesWebContext extends Web
      *
      * @return Header values Map.
      */
-    @Override
     public Map<String, String[]> getHeaderValues() {
 
     return (context.getExternalContext().getRequestHeaderValuesMap());
@@ -161,7 +158,6 @@ public class FacesWebContext extends Web
      *
      * @return Initialization parameter Map.
      */
-    @Override
     public Map<String, String> getInitParam() {
 
     return (context.getExternalContext().getInitParameterMap());
@@ -186,7 +182,6 @@ public class FacesWebContext extends Web
      *
      * @return Request parameter Map.
      */
-    @Override
     public Map<String, String[]> getParamValues() {
 
     return (context.getExternalContext().getRequestParameterValuesMap());
@@ -200,7 +195,6 @@ public class FacesWebContext extends Web
      * @return Map of Cookies.
      * @since Chain 1.1
      */
-    @Override
     public Map<String, Cookie> getCookies() {
 
         Map<String, Object> facesCookieMap =
@@ -236,7 +230,6 @@ public class FacesWebContext extends Web
      *
      * @return Request scope Map.
      */
-    @Override
     public Map<String, Object> getRequestScope() {
 
     return (context.getExternalContext().getRequestMap());
@@ -249,7 +242,6 @@ public class FacesWebContext extends Web
      *
      * @return Session scope Map.
      */
-    @Override
     public Map<String, Object> getSessionScope() {
 
     return (context.getExternalContext().getSessionMap());

Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletApplicationScopeMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletApplicationScopeMap.java?rev=1163728&r1=1163727&r2=1163728&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletApplicationScopeMap.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/portlet/PortletApplicationScopeMap.java Wed Aug 31 18:11:36 2011
@@ -47,7 +47,6 @@ final class PortletApplicationScopeMap i
     private PortletContext context = null;
 
 
-    @Override
     public void clear() {
         for (String key : keySet()) {
             context.removeAttribute(key);
@@ -55,13 +54,11 @@ final class PortletApplicationScopeMap i
     }
 
 
-    @Override
     public boolean containsKey(Object key) {
         return (context.getAttribute(key(key)) != null);
     }
 
 
-    @Override
     public boolean containsValue(Object value) {
         if (value == null) {
             return (false);
@@ -77,7 +74,6 @@ final class PortletApplicationScopeMap i
     }
 
 
-    @Override
     public Set<Entry<String, Object>> entrySet() {
         Set<Entry<String, Object>> set = new HashSet<Entry<String, Object>>();
         Enumeration<String> keys = context.getAttributeNames();
@@ -90,31 +86,26 @@ final class PortletApplicationScopeMap i
     }
 
 
-    @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);
     }
 
 
-    @Override
     public Set<String> keySet() {
         Set<String> set = new HashSet<String>();
         Enumeration<String> keys = context.getAttributeNames();
@@ -125,7 +116,6 @@ final class PortletApplicationScopeMap i
     }
 
 
-    @Override
     public Object put(String key, Object value) {
         if (value == null) {
             return (remove(key));
@@ -136,7 +126,6 @@ final class PortletApplicationScopeMap i
     }
 
 
-    @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());
@@ -144,7 +133,6 @@ final class PortletApplicationScopeMap i
     }
 
 
-    @Override
     public Object remove(Object key) {
         String skey = key(key);
         Object previous = context.getAttribute(skey);
@@ -153,7 +141,6 @@ final class PortletApplicationScopeMap i
     }
 
 
-    @Override
     public int size() {
         int n = 0;
         Enumeration<String> keys = context.getAttributeNames();
@@ -165,7 +152,6 @@ final class PortletApplicationScopeMap i
     }
 
 
-    @Override
     public Collection<Object> values() {
         List<Object> list = new ArrayList<Object>();
         Enumeration<String> keys = context.getAttributeNames();

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=1163728&r1=1163727&r2=1163728&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 Wed Aug 31 18:11:36 2011
@@ -47,25 +47,21 @@ 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) {
         return values().contains(value);
     }
 
 
-    @Override
     public Set<Entry<String, String>> entrySet() {
         Set<Entry<String, String>> set = new HashSet<Entry<String, String>>();
         Enumeration<String> keys = context.getInitParameterNames();
@@ -78,31 +74,26 @@ final class PortletInitParamMap implemen
     }
 
 
-    @Override
     public boolean equals(Object o) {
         return (context.equals(o));
     }
 
 
-    @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);
     }
 
 
-    @Override
     public Set<String> keySet() {
         Set<String> set = new HashSet<String>();
         Enumeration<String> keys = context.getInitParameterNames();
@@ -113,25 +104,21 @@ final class PortletInitParamMap implemen
     }
 
 
-    @Override
     public String put(String key, String value) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public void putAll(Map<? extends String, ? extends String> map) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public String remove(Object key) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public int size() {
         int n = 0;
         Enumeration<String> keys = context.getInitParameterNames();
@@ -143,7 +130,6 @@ final class PortletInitParamMap implemen
     }
 
 
-    @Override
     public Collection<String> values() {
         List<String> list = new ArrayList<String>();
         Enumeration<String> keys = context.getInitParameterNames();

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=1163728&r1=1163727&r2=1163728&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 Wed Aug 31 18:11:36 2011
@@ -47,25 +47,21 @@ 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) {
         return values().contains(value);
     }
 
 
-    @Override
     public Set<Entry<String, String>> entrySet() {
         Set<Entry<String, String>> set = new HashSet<Entry<String, String>>();
         Enumeration<String> keys = request.getParameterNames();
@@ -78,31 +74,26 @@ final class PortletParamMap implements M
     }
 
 
-    @Override
     public boolean equals(Object o) {
         return (request.equals(o));
     }
 
 
-    @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);
     }
 
 
-    @Override
     public Set<String> keySet() {
         Set<String> set = new HashSet<String>();
         Enumeration<String> keys = request.getParameterNames();
@@ -113,25 +104,21 @@ final class PortletParamMap implements M
     }
 
 
-    @Override
     public String put(String key, String value) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public void putAll(Map<? extends String, ? extends String> map) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public String remove(Object key) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public int size() {
         int n = 0;
         Enumeration<String> keys = request.getParameterNames();
@@ -143,7 +130,6 @@ final class PortletParamMap implements M
     }
 
 
-    @Override
     public Collection<String> values() {
         List<String> list = new ArrayList<String>();
         Enumeration<String> keys = request.getParameterNames();

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=1163728&r1=1163727&r2=1163728&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 Wed Aug 31 18:11:36 2011
@@ -47,25 +47,21 @@ 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) {
         return values().contains(value);
     }
 
 
-    @Override
     public Set<Entry<String, String[]>> entrySet() {
         Set<Entry<String, String[]>> set = new HashSet<Entry<String, String[]>>();
         Enumeration<String> keys = request.getParameterNames();
@@ -78,31 +74,26 @@ final class PortletParamValuesMap implem
     }
 
 
-    @Override
     public boolean equals(Object o) {
         return (request.equals(o));
     }
 
 
-    @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);
     }
 
 
-    @Override
     public Set<String> keySet() {
         Set<String> set = new HashSet<String>();
         Enumeration<String> keys = request.getParameterNames();
@@ -113,25 +104,21 @@ final class PortletParamValuesMap implem
     }
 
 
-    @Override
     public String[] put(String key, String[] value) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public void putAll(Map<? extends String, ? extends String[]> map) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public String[] remove(Object key) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public int size() {
         int n = 0;
         Enumeration<String> keys = request.getParameterNames();
@@ -143,7 +130,6 @@ final class PortletParamValuesMap implem
     }
 
 
-    @Override
     public Collection<String[]> values() {
         List<String[]> list = new ArrayList<String[]>();
         Enumeration<String> keys = request.getParameterNames();

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=1163728&r1=1163727&r2=1163728&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 Wed Aug 31 18:11:36 2011
@@ -47,7 +47,6 @@ final class PortletRequestScopeMap imple
     private PortletRequest request = null;
 
 
-    @Override
     public void clear() {
         for (String key : keySet()) {
             request.removeAttribute(key);
@@ -55,13 +54,11 @@ final class PortletRequestScopeMap imple
     }
 
 
-    @Override
     public boolean containsKey(Object key) {
         return (request.getAttribute(key(key)) != null);
     }
 
 
-    @Override
     public boolean containsValue(Object value) {
         if (value == null) {
             return (false);
@@ -77,7 +74,6 @@ final class PortletRequestScopeMap imple
     }
 
 
-    @Override
     public Set<Entry<String, Object>> entrySet() {
         Set<Entry<String, Object>> set = new HashSet<Entry<String, Object>>();
         Enumeration<String> keys = request.getAttributeNames();
@@ -90,31 +86,26 @@ final class PortletRequestScopeMap imple
     }
 
 
-    @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);
     }
 
 
-    @Override
     public Set<String> keySet() {
         Set<String> set = new HashSet<String>();
         Enumeration<String> keys = request.getAttributeNames();
@@ -125,7 +116,6 @@ final class PortletRequestScopeMap imple
     }
 
 
-    @Override
     public Object put(String key, Object value) {
         if (value == null) {
             return (remove(key));
@@ -137,7 +127,6 @@ final class PortletRequestScopeMap imple
     }
 
 
-    @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());
@@ -145,7 +134,6 @@ final class PortletRequestScopeMap imple
     }
 
 
-    @Override
     public Object remove(Object key) {
         String skey = key(key);
         Object previous = request.getAttribute(skey);
@@ -154,7 +142,6 @@ final class PortletRequestScopeMap imple
     }
 
 
-    @Override
     public int size() {
         int n = 0;
         Enumeration<String> keys = request.getAttributeNames();
@@ -166,7 +153,6 @@ final class PortletRequestScopeMap imple
     }
 
 
-    @Override
     public Collection<Object> values() {
         List<Object> list = new ArrayList<Object>();
         Enumeration<String> keys = request.getAttributeNames();

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=1163728&r1=1163727&r2=1163728&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 Wed Aug 31 18:11:36 2011
@@ -50,7 +50,6 @@ final class PortletSessionScopeMap imple
     private PortletRequest request = null;
 
 
-    @Override
     public void clear() {
         if (sessionExists()) {
             for (String key : keySet()) {
@@ -60,7 +59,6 @@ final class PortletSessionScopeMap imple
     }
 
 
-    @Override
     public boolean containsKey(Object key) {
         if (sessionExists()) {
             return (session.getAttribute(key(key)) != null);
@@ -70,7 +68,6 @@ final class PortletSessionScopeMap imple
     }
 
 
-    @Override
     public boolean containsValue(Object value) {
         if (value == null || !sessionExists()) {
             return (false);
@@ -87,7 +84,6 @@ final class PortletSessionScopeMap imple
     }
 
 
-    @Override
     public Set<Entry<String, Object>> entrySet() {
         Set<Entry<String, Object>> set = new HashSet<Entry<String, Object>>();
         if (sessionExists()) {
@@ -103,7 +99,6 @@ final class PortletSessionScopeMap imple
     }
 
 
-    @Override
     public boolean equals(Object o) {
         if (sessionExists()) {
             return (session.equals(o));
@@ -113,7 +108,6 @@ final class PortletSessionScopeMap imple
     }
 
 
-    @Override
     public Object get(Object key) {
         if (sessionExists()) {
             return (session.getAttribute(key(key)));
@@ -123,7 +117,6 @@ final class PortletSessionScopeMap imple
     }
 
 
-    @Override
     public int hashCode() {
         if (sessionExists()) {
             return (session.hashCode());
@@ -133,7 +126,6 @@ final class PortletSessionScopeMap imple
     }
 
 
-    @Override
     public boolean isEmpty() {
         if (sessionExists() &&
             session.getAttributeNames().hasMoreElements()) {
@@ -144,7 +136,6 @@ final class PortletSessionScopeMap imple
     }
 
 
-    @Override
     public Set<String> keySet() {
         Set<String> set = new HashSet<String>();
         if (sessionExists()) {
@@ -158,7 +149,6 @@ final class PortletSessionScopeMap imple
     }
 
 
-    @Override
     public Object put(String key, Object value) {
         if (value == null) {
             return (remove(key));
@@ -178,7 +168,6 @@ final class PortletSessionScopeMap imple
     }
 
 
-    @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());
@@ -186,7 +175,6 @@ final class PortletSessionScopeMap imple
     }
 
 
-    @Override
     public Object remove(Object key) {
         if (sessionExists()) {
             String skey = key(key);
@@ -199,7 +187,6 @@ final class PortletSessionScopeMap imple
     }
 
 
-    @Override
     public int size() {
         int n = 0;
         if (sessionExists()) {
@@ -214,7 +201,6 @@ final class PortletSessionScopeMap imple
     }
 
 
-    @Override
     public Collection<Object> values() {
         List<Object> list = new ArrayList<Object>();
         if (sessionExists()) {

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=1163728&r1=1163727&r2=1163728&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 Wed Aug 31 18:11:36 2011
@@ -239,7 +239,6 @@ public class PortletWebContext extends W
      *
      * @return Application scope Map.
      */
-    @Override
     public Map<String, Object> getApplicationScope() {
 
         if ((applicationScope == null) && (context != null)) {
@@ -255,7 +254,6 @@ public class PortletWebContext extends W
      *
      * @return Header values Map.
      */
-    @Override
     public Map<String, String> getHeader() {
 
         if ((header == null) && (request != null)) {
@@ -272,7 +270,6 @@ public class PortletWebContext extends W
      *
      * @return Header values Map.
      */
-    @Override
     public Map<String, String[]> getHeaderValues() {
 
         if ((headerValues == null) && (request != null)) {
@@ -289,7 +286,6 @@ public class PortletWebContext extends W
      *
      * @return Initialization parameter Map.
      */
-    @Override
     public Map<String, String> getInitParam() {
 
         if ((initParam == null) && (context != null)) {
@@ -305,7 +301,6 @@ public class PortletWebContext extends W
      *
      * @return Request parameter Map.
      */
-    @Override
     public Map<String, String> getParam() {
 
         if ((param == null) && (request != null)) {
@@ -321,7 +316,6 @@ public class PortletWebContext extends W
      *
      * @return Request parameter Map.
      */
-    @Override
     public Map<String, String[]> getParamValues() {
 
         if ((paramValues == null) && (request != null)) {
@@ -338,7 +332,6 @@ public class PortletWebContext extends W
      * @return An empty Map.
      * @since Chain 1.1
      */
-    @Override
     public Map<String, Cookie> getCookies() {
 
         return Collections.EMPTY_MAP;
@@ -351,7 +344,6 @@ public class PortletWebContext extends W
      *
      * @return Request scope Map.
      */
-    @Override
     public Map<String, Object> getRequestScope() {
 
         if ((requestScope == null) && (request != null)) {
@@ -367,7 +359,6 @@ public class PortletWebContext extends W
      *
      * @return Session scope Map.
      */
-    @Override
     public Map<String, Object> getSessionScope() {
 
         if ((sessionScope == null) && (request != null)) {

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=1163728&r1=1163727&r2=1163728&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 Wed Aug 31 18:11:36 2011
@@ -125,7 +125,6 @@ public class ChainProcessor extends Chai
     /**
      * <p>Clean up as this application is shut down.</p>
      */
-    @Override
     public void destroy() {
 
         super.destroy();
@@ -141,7 +140,6 @@ public class ChainProcessor extends Chai
      *
      * @exception ServletException if an initialization error occurs
      */
-    @Override
     public void init() throws ServletException {
 
         super.init();
@@ -166,7 +164,6 @@ 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=1163728&r1=1163727&r2=1163728&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 Wed Aug 31 18:11:36 2011
@@ -92,7 +92,6 @@ public class PathInfoMapper extends Look
      *
      * @since Chain 1.2
      */
-    @Override
     protected String getCommandName(Context context) {
 
         // Look up the extra path information for this request
@@ -118,7 +117,6 @@ 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=1163728&r1=1163727&r2=1163728&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 Wed Aug 31 18:11:36 2011
@@ -120,7 +120,6 @@ public class RequestParameterMapper exte
      *
      * @since Chain 1.2
      */
-    @Override
     protected String getCommandName(Context context) {
 
         // Look up the specified request parameter for this request
@@ -142,7 +141,6 @@ 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=1163728&r1=1163727&r2=1163728&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 Wed Aug 31 18:11:36 2011
@@ -47,7 +47,6 @@ final class ServletApplicationScopeMap i
     private ServletContext context = null;
 
 
-    @Override
     public void clear() {
         for (String key : keySet()) {
             context.removeAttribute(key);
@@ -55,13 +54,11 @@ final class ServletApplicationScopeMap i
     }
 
 
-    @Override
     public boolean containsKey(Object key) {
         return (context.getAttribute(key(key)) != null);
     }
 
 
-    @Override
     public boolean containsValue(Object value) {
         if (value == null) {
             return (false);
@@ -77,7 +74,6 @@ final class ServletApplicationScopeMap i
     }
 
 
-    @Override
     public Set<Entry<String, Object>> entrySet() {
         Set<Entry<String, Object>> set = new HashSet<Entry<String, Object>>();
         Enumeration<String> keys = context.getAttributeNames();
@@ -90,31 +86,26 @@ final class ServletApplicationScopeMap i
     }
 
 
-    @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);
     }
 
 
-    @Override
     public Set<String> keySet() {
         Set<String> set = new HashSet<String>();
         Enumeration<String> keys = context.getAttributeNames();
@@ -125,7 +116,6 @@ final class ServletApplicationScopeMap i
     }
 
 
-    @Override
     public Object put(String key, Object value) {
         if (value == null) {
             return (remove(key));
@@ -136,7 +126,6 @@ final class ServletApplicationScopeMap i
     }
 
 
-    @Override
     public void putAll(Map<? extends String, ? extends Object> map) {
 
         for (Entry<? extends String, ? extends Object> entry : map.entrySet()) {
@@ -145,7 +134,6 @@ final class ServletApplicationScopeMap i
     }
 
 
-    @Override
     public Object remove(Object key) {
         String skey = key(key);
         Object previous = context.getAttribute(skey);
@@ -154,7 +142,6 @@ final class ServletApplicationScopeMap i
     }
 
 
-    @Override
     public int size() {
         int n = 0;
         Enumeration<String> keys = context.getAttributeNames();
@@ -166,7 +153,6 @@ final class ServletApplicationScopeMap i
     }
 
 
-    @Override
     public Collection<Object> values() {
         List<Object> list = new ArrayList<Object>();
 

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=1163728&r1=1163727&r2=1163728&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 Wed Aug 31 18:11:36 2011
@@ -46,19 +46,16 @@ 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) {
@@ -72,7 +69,6 @@ final class ServletCookieMap implements 
     }
 
 
-    @Override
     public Set<Entry<String, Cookie>> entrySet() {
         Set<Entry<String, Cookie>> set = new HashSet<Entry<String, Cookie>>();
         Cookie[] cookies = request.getCookies();
@@ -85,13 +81,11 @@ final class ServletCookieMap implements 
     }
 
 
-    @Override
     public boolean equals(Object o) {
         return (request.equals(o));
     }
 
 
-    @Override
     public Cookie get(Object key) {
         Cookie[] cookies = request.getCookies();
         if (cookies != null) {
@@ -105,19 +99,16 @@ final class ServletCookieMap implements 
     }
 
 
-    @Override
     public int hashCode() {
         return (request.hashCode());
     }
 
 
-    @Override
     public boolean isEmpty() {
         return (size() < 1);
     }
 
 
-    @Override
     public Set<String> keySet() {
         Set<String> set = new HashSet<String>();
         Cookie[] cookies = request.getCookies();
@@ -130,31 +121,26 @@ final class ServletCookieMap implements 
     }
 
 
-    @Override
     public Cookie put(String key, Cookie value) {
         throw new UnsupportedOperationException();
     }
 
-    @Override
     public void putAll(Map<? extends String, ? extends Cookie> map) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public Cookie remove(Object key) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public int size() {
         Cookie[] cookies = request.getCookies();
         return (cookies == null ?  0 : cookies.length);
     }
 
 
-    @Override
     public Collection<Cookie> values() {
         List<Cookie> list = new ArrayList<Cookie>(size());
         Cookie[] cookies = request.getCookies();

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=1163728&r1=1163727&r2=1163728&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 Wed Aug 31 18:11:36 2011
@@ -47,25 +47,21 @@ 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) {
         return values().contains(value);
     }
 
 
-    @Override
     public Set<Entry<String, String>> entrySet() {
         Set<Entry<String, String>> set = new HashSet<Entry<String, String>>();
         Enumeration<String> keys = request.getHeaderNames();
@@ -78,31 +74,26 @@ final class ServletHeaderMap implements 
     }
 
 
-    @Override
     public boolean equals(Object o) {
         return (request.equals(o));
     }
 
 
-    @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);
     }
 
 
-    @Override
     public Set<String> keySet() {
         Set<String> set = new HashSet<String>();
         Enumeration<String> keys = request.getHeaderNames();
@@ -113,25 +104,21 @@ final class ServletHeaderMap implements 
     }
 
 
-    @Override
     public String put(String key, String value) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public void putAll(Map<? extends String, ? extends String> map) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public String remove(Object key) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public int size() {
         int n = 0;
         Enumeration keys = request.getHeaderNames();
@@ -143,7 +130,6 @@ final class ServletHeaderMap implements 
     }
 
 
-    @Override
     public Collection<String> values() {
         List<String> list = new ArrayList<String>();
         Enumeration<String> keys = request.getHeaderNames();

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=1163728&r1=1163727&r2=1163728&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 Wed Aug 31 18:11:36 2011
@@ -47,19 +47,16 @@ 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);
@@ -85,7 +82,6 @@ final class ServletHeaderValuesMap imple
     }
 
 
-    @Override
     public Set<Entry<String, String[]>> entrySet() {
         Set<Entry<String, String[]>> set = new HashSet<Entry<String, String[]>>();
         Enumeration<String> keys = request.getHeaderNames();
@@ -104,13 +100,11 @@ final class ServletHeaderValuesMap imple
     }
 
 
-    @Override
     public boolean equals(Object o) {
         return (request.equals(o));
     }
 
 
-    @Override
     public String[] get(Object key) {
         Enumeration<String> values = request.getHeaders(key(key));
         String[] valuesArray = enumerationToArray(values);
@@ -119,19 +113,16 @@ final class ServletHeaderValuesMap imple
     }
 
 
-    @Override
     public int hashCode() {
         return (request.hashCode());
     }
 
 
-    @Override
     public boolean isEmpty() {
         return (size() < 1);
     }
 
 
-    @Override
     public Set<String> keySet() {
         Set<String> set = new HashSet<String>();
         Enumeration<String> keys = request.getHeaderNames();
@@ -142,25 +133,21 @@ final class ServletHeaderValuesMap imple
     }
 
 
-    @Override
     public String[] put(String key, String[] value) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public void putAll(Map<? extends String, ? extends String[]> map) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public String[] remove(Object key) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public int size() {
         int n = 0;
         Enumeration keys = request.getHeaderNames();
@@ -172,7 +159,6 @@ final class ServletHeaderValuesMap imple
     }
 
 
-    @Override
     public Collection<String[]> values() {
         List<String[]> list = new ArrayList<String[]>();
         Enumeration<String> keys = request.getHeaderNames();

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=1163728&r1=1163727&r2=1163728&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 Wed Aug 31 18:11:36 2011
@@ -47,25 +47,21 @@ 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) {
         return values().contains(value);
     }
 
 
-    @Override
     public Set<Entry<String, String>> entrySet() {
         Set<Entry<String, String>> set = new HashSet<Entry<String, String>>();
         Enumeration<String> keys = context.getInitParameterNames();
@@ -78,31 +74,26 @@ final class ServletInitParamMap implemen
     }
 
 
-    @Override
     public boolean equals(Object o) {
         return (context.equals(o));
     }
 
 
-    @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);
     }
 
 
-    @Override
     public Set<String> keySet() {
         Set<String> set = new HashSet<String>();
         Enumeration<String> keys = context.getInitParameterNames();
@@ -113,25 +104,21 @@ final class ServletInitParamMap implemen
         return (set);
     }
 
-    @Override
     public String put(String key, String value) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public void putAll(Map<? extends String, ? extends String> map) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public String remove(Object key) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public int size() {
         int n = 0;
         Enumeration<String> keys = context.getInitParameterNames();
@@ -143,7 +130,6 @@ final class ServletInitParamMap implemen
     }
 
 
-    @Override
     public Collection<String> values() {
         List<String> list = new ArrayList<String>();
         Enumeration<String> keys = context.getInitParameterNames();

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=1163728&r1=1163727&r2=1163728&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 Wed Aug 31 18:11:36 2011
@@ -47,25 +47,21 @@ 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) {
         return values().contains(value);
     }
 
 
-    @Override
     public Set<Entry<String, String>> entrySet() {
         Set<Entry<String, String>> set = new HashSet<Entry<String, String>>();
         Enumeration<String> keys = request.getParameterNames();
@@ -78,31 +74,26 @@ final class ServletParamMap implements M
     }
 
 
-    @Override
     public boolean equals(Object o) {
         return (request.equals(o));
     }
 
 
-    @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);
     }
 
 
-    @Override
     public Set<String> keySet() {
         Set<String> set = new HashSet<String>();
         Enumeration<String> keys = request.getParameterNames();
@@ -113,25 +104,21 @@ final class ServletParamMap implements M
     }
 
 
-    @Override
     public String put(String key, String value) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public void putAll(Map<? extends String, ? extends String> map) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public String remove(Object key) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public int size() {
         int n = 0;
         Enumeration<String> keys = request.getParameterNames();
@@ -143,7 +130,6 @@ final class ServletParamMap implements M
     }
 
 
-    @Override
     public Collection<String> values() {
         List<String> list = new ArrayList<String>();
         Enumeration<String> keys = request.getParameterNames();

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=1163728&r1=1163727&r2=1163728&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 Wed Aug 31 18:11:36 2011
@@ -47,25 +47,21 @@ 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) {
         return values().contains(value);
     }
 
 
-    @Override
     public Set<Entry<String, String[]>> entrySet() {
         Set<Entry<String, String[]>> set = new HashSet<Entry<String, String[]>>();
         Enumeration<String> keys = request.getParameterNames();
@@ -78,31 +74,26 @@ final class ServletParamValuesMap implem
     }
 
 
-    @Override
     public boolean equals(Object o) {
         return (request.equals(o));
     }
 
 
-    @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);
     }
 
 
-    @Override
     public Set<String> keySet() {
         Set<String> set = new HashSet<String>();
         Enumeration<String> keys = request.getParameterNames();
@@ -113,25 +104,21 @@ final class ServletParamValuesMap implem
     }
 
 
-    @Override
     public String[] put(String key, String[] value) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public void putAll(Map<? extends String, ? extends String[]> map) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public String[] remove(Object key) {
         throw new UnsupportedOperationException();
     }
 
 
-    @Override
     public int size() {
         int n = 0;
         Enumeration<String> keys = request.getParameterNames();
@@ -143,7 +130,6 @@ final class ServletParamValuesMap implem
     }
 
 
-    @Override
     public Collection<String[]> values() {
         List<String[]> list = new ArrayList();
         Enumeration<String> keys = request.getParameterNames();

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=1163728&r1=1163727&r2=1163728&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 Wed Aug 31 18:11:36 2011
@@ -117,7 +117,6 @@ 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=1163728&r1=1163727&r2=1163728&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 Wed Aug 31 18:11:36 2011
@@ -47,7 +47,6 @@ final class ServletRequestScopeMap imple
     private HttpServletRequest request = null;
 
 
-    @Override
     public void clear() {
         for (String key : keySet()) {
             request.removeAttribute(key);
@@ -55,13 +54,11 @@ final class ServletRequestScopeMap imple
     }
 
 
-    @Override
     public boolean containsKey(Object key) {
         return (request.getAttribute(key(key)) != null);
     }
 
 
-    @Override
     public boolean containsValue(Object value) {
         if (value == null) {
             return (false);
@@ -77,7 +74,6 @@ final class ServletRequestScopeMap imple
     }
 
 
-    @Override
     public Set<Entry<String, Object>> entrySet() {
         Set<Entry<String, Object>> set = new HashSet<Entry<String, Object>>();
         Enumeration<String> keys = request.getAttributeNames();
@@ -90,31 +86,26 @@ final class ServletRequestScopeMap imple
     }
 
 
-    @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);
     }
 
 
-    @Override
     public Set<String> keySet() {
         Set<String> set = new HashSet<String>();
         Enumeration<String> keys = request.getAttributeNames();
@@ -125,7 +116,6 @@ final class ServletRequestScopeMap imple
     }
 
 
-    @Override
     public Object put(String key, Object value) {
         if (value == null) {
             return (remove(key));
@@ -136,7 +126,6 @@ final class ServletRequestScopeMap imple
     }
 
 
-    @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());
@@ -145,7 +134,6 @@ final class ServletRequestScopeMap imple
     }
 
 
-    @Override
     public Object remove(Object key) {
         String skey = key(key);
         Object previous = request.getAttribute(skey);
@@ -154,7 +142,6 @@ final class ServletRequestScopeMap imple
     }
 
 
-    @Override
     public int size() {
         int n = 0;
         Enumeration keys = request.getAttributeNames();
@@ -166,7 +153,6 @@ final class ServletRequestScopeMap imple
     }
 
 
-    @Override
     public Collection<Object> values() {
         List<Object> list = new ArrayList<Object>();
         Enumeration<String> keys = request.getAttributeNames();

Modified: commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletSessionScopeMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletSessionScopeMap.java?rev=1163728&r1=1163727&r2=1163728&view=diff
==============================================================================
--- commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletSessionScopeMap.java (original)
+++ commons/proper/chain/branches/version-2.0-work/src/main/java/org/apache/commons/chain/web/servlet/ServletSessionScopeMap.java Wed Aug 31 18:11:36 2011
@@ -50,7 +50,6 @@ final class ServletSessionScopeMap imple
     private HttpServletRequest request = null;
 
 
-    @Override
     public void clear() {
         if (sessionExists()) {
             for (String key : keySet()) {
@@ -60,7 +59,6 @@ final class ServletSessionScopeMap imple
     }
 
 
-    @Override
     public boolean containsKey(Object key) {
         if (sessionExists()) {
             return (session.getAttribute(key(key)) != null);
@@ -70,7 +68,6 @@ final class ServletSessionScopeMap imple
     }
 
 
-    @Override
     public boolean containsValue(Object value) {
         if (value == null || !sessionExists()) {
             return (false);
@@ -86,7 +83,6 @@ final class ServletSessionScopeMap imple
     }
 
 
-    @Override
     public Set<Entry<String, Object>> entrySet() {
         Set<Entry<String, Object>> set = new HashSet<Entry<String, Object>>();
         if (sessionExists()) {
@@ -101,7 +97,6 @@ final class ServletSessionScopeMap imple
     }
 
 
-    @Override
     public boolean equals(Object o) {
         if (sessionExists()) {
             return (session.equals(o));
@@ -111,7 +106,6 @@ final class ServletSessionScopeMap imple
     }
 
 
-    @Override
     public Object get(Object key) {
         if (sessionExists()) {
             return (session.getAttribute(key(key)));
@@ -121,7 +115,6 @@ final class ServletSessionScopeMap imple
     }
 
 
-    @Override
     public int hashCode() {
         if (sessionExists()) {
             return (session.hashCode());
@@ -131,7 +124,6 @@ final class ServletSessionScopeMap imple
     }
 
 
-    @Override
     public boolean isEmpty() {
         if (sessionExists() &&
             session.getAttributeNames().hasMoreElements()) {
@@ -142,7 +134,6 @@ final class ServletSessionScopeMap imple
     }
 
 
-    @Override
     public Set<String> keySet() {
         Set<String> set = new HashSet<String>();
         if (sessionExists()) {
@@ -155,7 +146,6 @@ final class ServletSessionScopeMap imple
     }
 
 
-    @Override
     public Object put(String key, Object value) {
         if (value == null) {
             return (remove(key));
@@ -174,7 +164,6 @@ final class ServletSessionScopeMap imple
     }
 
 
-    @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());
@@ -182,7 +171,6 @@ final class ServletSessionScopeMap imple
     }
 
 
-    @Override
     public Object remove(Object key) {
         if (sessionExists()) {
             String skey = key(key);
@@ -195,7 +183,6 @@ final class ServletSessionScopeMap imple
     }
 
 
-    @Override
     public int size() {
         int n = 0;
         if (sessionExists()) {
@@ -209,7 +196,6 @@ final class ServletSessionScopeMap imple
     }
 
 
-    @Override
     public Collection<Object> values() {
         List<Object> list = new ArrayList<Object>();
         if (sessionExists()) {



Mime
View raw message