commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mart...@apache.org
Subject cvs commit: jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet ChainProcessor.java ServletApplicationScopeMap.java ServletHeaderValuesMap.java ServletRequestScopeMap.java ServletSessionScopeMap.java
Date Tue, 30 Nov 2004 05:52:23 GMT
martinc     2004/11/29 21:52:23

  Modified:    chain    checkstyle.xml
               chain/src/java/org/apache/commons/chain Catalog.java
                        CatalogFactory.java Filter.java
               chain/src/java/org/apache/commons/chain/config
                        ConfigCatalogRule.java ConfigDefineRule.java
                        ConfigRegisterRule.java ConfigRuleSet.java
               chain/src/java/org/apache/commons/chain/generic
                        LookupCommand.java
               chain/src/java/org/apache/commons/chain/impl
                        CatalogBase.java CatalogFactoryBase.java
                        ChainBase.java ContextBase.java
               chain/src/java/org/apache/commons/chain/web
                        ChainListener.java ChainResources.java
                        ChainServlet.java MapEntry.java WebContext.java
               chain/src/java/org/apache/commons/chain/web/portlet
                        PortletApplicationScopeMap.java
                        PortletRequestScopeMap.java
                        PortletSessionScopeMap.java
               chain/src/java/org/apache/commons/chain/web/servlet
                        ChainProcessor.java ServletApplicationScopeMap.java
                        ServletHeaderValuesMap.java
                        ServletRequestScopeMap.java
                        ServletSessionScopeMap.java
  Added:       chain    license-header.txt
  Log:
  Fix around 660 Checkstyle errors prior to the 1.0 release.
  
  Revision  Changes    Path
  1.2       +5 -5      jakarta-commons/chain/checkstyle.xml
  
  Index: checkstyle.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/checkstyle.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- checkstyle.xml	1 Jul 2004 21:34:09 -0000	1.1
  +++ checkstyle.xml	30 Nov 2004 05:52:22 -0000	1.2
  @@ -29,15 +29,15 @@
             <!-- Checks that are different from the sun coding conventions ones -->
             <!-- ************************************************************** -->
             <module name="Header">
  -              <property name="headerFile" value="${basedir}/LICENSE.txt"/>
  -              <property name="ignoreLines" value="1,2,3,4,5,6"/>
  +              <property name="headerFile" value="${basedir}/license-header.txt"/>
  +              <property name="ignoreLines" value="2"/>
             </module>
             <property name="tabWidth" value="4"/>
             <module name="LeftCurly">
               <property name="option" value="eol"/>
             </module>
             <module name="RightCurly">
  -            <property name="option" value="alone"/>
  +            <property name="option" value="same"/>
             </module>
             <module name="LineLength">
               <property name="max" value="132"/>
  @@ -130,7 +130,7 @@
     
             <!-- Checks for class design                         -->
             <!-- See http://checkstyle.sf.net/config_design.html -->
  -          <module name="DesignForExtension"/>
  +          <!-- module name="DesignForExtension"/ -->
             <module name="FinalClass"/>
             <module name="HideUtilityClassConstructor"/>
             <module name="InterfaceIsType"/>
  @@ -140,7 +140,7 @@
             <!-- Miscellaneous other checks.                   -->
             <!-- See http://checkstyle.sf.net/config_misc.html -->
             <module name="ArrayTypeStyle"/>
  -          <module name="FinalParameters"/>
  +          <!-- module name="FinalParameters"/ -->
             <module name="GenericIllegalRegexp">
                 <property name="format" value="\s+$"/>
                 <property name="message" value="Line has trailing spaces."/>
  
  
  
  1.1                  jakarta-commons/chain/license-header.txt
  
  Index: license-header.txt
  ===================================================================
  /*
   * Copyright 2001-2004 The Apache Software Foundation
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   *
   *     http://www.apache.org/licenses/LICENSE-2.0
   *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
  
  
  
  1.7       +2 -2      jakarta-commons/chain/src/java/org/apache/commons/chain/Catalog.java
  
  Index: Catalog.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/Catalog.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Catalog.java	25 Feb 2004 00:01:07 -0000	1.6
  +++ Catalog.java	30 Nov 2004 05:52:22 -0000	1.7
  @@ -37,7 +37,7 @@
        * <p>A default context attribute for storing a default {@link Catalog},
        * provided as a convenience only.</p>
        */
  -    public static final String CATALOG_KEY = "org.apache.commons.chain.CATALOG";
  +    String CATALOG_KEY = "org.apache.commons.chain.CATALOG";
   
   
       /**
  
  
  
  1.5       +6 -6      jakarta-commons/chain/src/java/org/apache/commons/chain/CatalogFactory.java
  
  Index: CatalogFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/CatalogFactory.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CatalogFactory.java	18 Oct 2004 01:07:41 -0000	1.4
  +++ CatalogFactory.java	30 Nov 2004 05:52:22 -0000	1.5
  @@ -26,7 +26,7 @@
    * as well as {@link Catalog}s stored with a name key.  Follows the
    * Factory pattern (see GoF).</p>
    *
  - * @author Sean Schofield 
  + * @author Sean Schofield
    * @version $Revision$ $Date$
    */
   
  @@ -82,7 +82,7 @@
   
   
       // ------------------------------------------------------- Static Variables
  -    
  +
   
       /**
        * <p>The set of registered {@link CatalogFactory} instances,
  @@ -101,7 +101,7 @@
        * running inside a servet container), this will return a separate
        * instance for each application, even if this class is loaded from
        * a shared parent class loader.</p>
  -     * 
  +     *
        * @return the per-application singleton instance of {@link CatalogFactory}
        */
       public static CatalogFactory getInstance() {
  @@ -116,9 +116,9 @@
               }
           }
           return factory;
  -        
  +
       }
  -    
  +
   
       /**
        * <p>Clear all references to registered catalogs, as well as to the
  
  
  
  1.6       +2 -2      jakarta-commons/chain/src/java/org/apache/commons/chain/Filter.java
  
  Index: Filter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/Filter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Filter.java	25 Feb 2004 00:01:07 -0000	1.5
  +++ Filter.java	30 Nov 2004 05:52:23 -0000	1.6
  @@ -60,7 +60,7 @@
        * @return If a non-null <code>exception</code> was "handled" by this
        *  method (and therefore need not be rethrown), return <code>true</code>;
        *  otherwise return <code>false</code>
  -     */ 
  +     */
      boolean postprocess(Context context, Exception exception);
   
   
  
  
  
  1.2       +3 -5      jakarta-commons/chain/src/java/org/apache/commons/chain/config/ConfigCatalogRule.java
  
  Index: ConfigCatalogRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/config/ConfigCatalogRule.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConfigCatalogRule.java	18 Oct 2004 18:47:12 -0000	1.1
  +++ ConfigCatalogRule.java	30 Nov 2004 05:52:23 -0000	1.2
  @@ -18,8 +18,6 @@
   
   import org.apache.commons.chain.Catalog;
   import org.apache.commons.chain.CatalogFactory;
  -import org.apache.commons.chain.Chain;
  -import org.apache.commons.chain.Command;
   import org.apache.commons.digester.Rule;
   import org.xml.sax.Attributes;
   
  @@ -83,10 +81,10 @@
        * if there is no such attribute defined.  Push it onto the top of the
        * stack.</p>
        *
  -     * @param namespace the namespace URI of the matching element, or an 
  +     * @param namespace the namespace URI of the matching element, or an
        *   empty string if the parser is not namespace aware or the element has
        *   no namespace
  -     * @param name the local name if the parser is namespace aware, or just 
  +     * @param name the local name if the parser is namespace aware, or just
        *   the element name otherwise
        * @param attributes The attribute list of this element
        */
  
  
  
  1.2       +3 -6      jakarta-commons/chain/src/java/org/apache/commons/chain/config/ConfigDefineRule.java
  
  Index: ConfigDefineRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/config/ConfigDefineRule.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConfigDefineRule.java	16 Jul 2004 19:06:01 -0000	1.1
  +++ ConfigDefineRule.java	30 Nov 2004 05:52:23 -0000	1.2
  @@ -16,9 +16,6 @@
   package org.apache.commons.chain.config;
   
   
  -import org.apache.commons.chain.Catalog;
  -import org.apache.commons.chain.Chain;
  -import org.apache.commons.chain.Command;
   import org.apache.commons.digester.Rule;
   import org.xml.sax.Attributes;
   
  @@ -80,10 +77,10 @@
       /**
        * <p>Register new rules for the specified name and class.</p>
        *
  -     * @param namespace the namespace URI of the matching element, or an 
  +     * @param namespace the namespace URI of the matching element, or an
        *   empty string if the parser is not namespace aware or the element has
        *   no namespace
  -     * @param name the local name if the parser is namespace aware, or just 
  +     * @param name the local name if the parser is namespace aware, or just
        *   the element name otherwise
        * @param attributes The attribute list of this element
        */
  
  
  
  1.5       +5 -5      jakarta-commons/chain/src/java/org/apache/commons/chain/config/ConfigRegisterRule.java
  
  Index: ConfigRegisterRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/config/ConfigRegisterRule.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ConfigRegisterRule.java	25 Feb 2004 00:01:06 -0000	1.4
  +++ ConfigRegisterRule.java	30 Nov 2004 05:52:23 -0000	1.5
  @@ -69,10 +69,10 @@
       /**
        * <p>Register the top {@link Command} if appropriate.</p>
        *
  -     * @param namespace the namespace URI of the matching element, or an 
  +     * @param namespace the namespace URI of the matching element, or an
        *   empty string if the parser is not namespace aware or the element has
        *   no namespace
  -     * @param name the local name if the parser is namespace aware, or just 
  +     * @param name the local name if the parser is namespace aware, or just
        *   the element name otherwise
        * @param attributes The attribute list of this element
        */
  @@ -81,8 +81,8 @@
   
           // Is the top object a Command?
           Object top = digester.peek(0);
  -        if ((top == null) ||
  -            !(top instanceof Command)) {
  +        if ((top == null)
  +            || !(top instanceof Command)) {
               return;
           }
           Command command = (Command) top;
  
  
  
  1.9       +3 -7      jakarta-commons/chain/src/java/org/apache/commons/chain/config/ConfigRuleSet.java
  
  Index: ConfigRuleSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/config/ConfigRuleSet.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ConfigRuleSet.java	18 Oct 2004 01:07:41 -0000	1.8
  +++ ConfigRuleSet.java	30 Nov 2004 05:52:23 -0000	1.9
  @@ -16,10 +16,6 @@
   package org.apache.commons.chain.config;
   
   
  -import org.apache.commons.chain.Catalog;
  -import org.apache.commons.chain.CatalogFactory;
  -import org.apache.commons.chain.Chain;
  -import org.apache.commons.chain.Command;
   import org.apache.commons.digester.Digester;
   import org.apache.commons.digester.RuleSetBase;
   
  @@ -53,7 +49,7 @@
    * <li><strong>classAttribute</strong> -- Attribute on a chain (optional)
or
    *     command (required) element that specifies the fully qualified class
    *     name of the implementation class that should be instantiated.
  - *     [className]</li> 
  + *     [className]</li>
    * <li><strong>commandElement</strong> -- Name of the XML element
    *     representing the addition of a {@link Command}.  An implementation
    *     class name must be provided on the attribute named by the
  @@ -69,7 +65,7 @@
    *     rules will be associated, or <code>null</code> for no namespace.
    *     [null]</li>
    * </ul>
  - * 
  + *
    * @author Craig R. McClanahan
    * @version $Revision$ $Date$
    */
  
  
  
  1.10      +5 -6      jakarta-commons/chain/src/java/org/apache/commons/chain/generic/LookupCommand.java
  
  Index: LookupCommand.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/generic/LookupCommand.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- LookupCommand.java	22 Oct 2004 18:06:47 -0000	1.9
  +++ LookupCommand.java	30 Nov 2004 05:52:23 -0000	1.10
  @@ -18,7 +18,6 @@
   
   import org.apache.commons.chain.Catalog;
   import org.apache.commons.chain.CatalogFactory;
  -import org.apache.commons.chain.Chain;
   import org.apache.commons.chain.Command;
   import org.apache.commons.chain.Context;
   import org.apache.commons.chain.Filter;
  @@ -246,12 +245,12 @@
               if ((command == null) && !isOptional()) {
                   if (catalogName == null) {
                       throw new IllegalArgumentException
  -                        ("Cannot find command '" + name +
  -                         "' in default catalog");
  +                        ("Cannot find command '" + name
  +                         + "' in default catalog");
                   } else {
                       throw new IllegalArgumentException
  -                        ("Cannot find command '" + name +
  -                         "' in catalog '" + catalogName + "'");
  +                        ("Cannot find command '" + name
  +                         + "' in catalog '" + catalogName + "'");
                   }
               }
               return (command);
  
  
  
  1.12      +1 -2      jakarta-commons/chain/src/java/org/apache/commons/chain/impl/CatalogBase.java
  
  Index: CatalogBase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/impl/CatalogBase.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- CatalogBase.java	17 Nov 2004 07:59:18 -0000	1.11
  +++ CatalogBase.java	30 Nov 2004 05:52:23 -0000	1.12
  @@ -21,7 +21,6 @@
   import java.util.Iterator;
   import java.util.Map;
   import org.apache.commons.chain.Catalog;
  -import org.apache.commons.chain.Chain;
   import org.apache.commons.chain.Command;
   
   
  
  
  
  1.4       +18 -19    jakarta-commons/chain/src/java/org/apache/commons/chain/impl/CatalogFactoryBase.java
  
  Index: CatalogFactoryBase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/impl/CatalogFactoryBase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CatalogFactoryBase.java	18 Oct 2004 01:07:42 -0000	1.3
  +++ CatalogFactoryBase.java	30 Nov 2004 05:52:23 -0000	1.4
  @@ -16,7 +16,6 @@
   
   package org.apache.commons.chain.impl;
   
  -import java.util.Collections;
   import java.util.HashMap;
   import java.util.Iterator;
   import java.util.Map;
  @@ -26,26 +25,26 @@
   /**
    * <p>A simple implementation of {@link CatalogFactory}.</p>
    *
  - * @author Sean Schofield 
  + * @author Sean Schofield
    * @version $Revision$ $Date$
    */
   
   public class CatalogFactoryBase extends CatalogFactory {
  -    
  +
   
       // ----------------------------------------------------------- Constructors
  -    
  -    
  +
  +
       /**
        * <p>Construct an empty instance of {@link CatalogFactoryBase}.  This
        * constructor is intended solely for use by {@link CatalogFactory}.</p>
        */
  -    public CatalogFactoryBase() {}
  -    
  -    
  +    public CatalogFactoryBase() { }
  +
  +
       // ----------------------------------------------------- Instance Variables
  -    
  -    
  +
  +
       /**
        * <p>The default {@link Catalog} for this {@link CatalogFactory).</p>
        */
  @@ -56,14 +55,14 @@
        * <p>Map of named {@link Catalog}s, keyed by catalog name.</p>
        */
       private Map catalogs = new HashMap();
  -    
  -    
  +
  +
       // --------------------------------------------------------- Public Methods
  -    
  +
   
       // Documented in CatalogFactory interface
       public Catalog getCatalog() {
  -        
  +
           return catalog;
   
       }
  @@ -71,15 +70,15 @@
   
       // Documented in CatalogFactory interface
       public void setCatalog(Catalog catalog) {
  -        
  +
           this.catalog = catalog;
  -        
  +
       }
   
   
       // Documented in CatalogFactory interface
       public Catalog getCatalog(String name) {
  -        
  +
           synchronized (catalogs) {
               return (Catalog) catalogs.get(name);
           }
  @@ -95,7 +94,7 @@
           }
   
       }
  -    
  +
   
       // Documented in CatalogFactory interface
       public Iterator getNames() {
  
  
  
  1.6       +5 -5      jakarta-commons/chain/src/java/org/apache/commons/chain/impl/ChainBase.java
  
  Index: ChainBase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/impl/ChainBase.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ChainBase.java	25 Feb 2004 00:01:06 -0000	1.5
  +++ ChainBase.java	30 Nov 2004 05:52:23 -0000	1.6
  @@ -71,7 +71,7 @@
        *  or one of the individual {@link Command} elements,
        *  is <code>null</code>
        */
  -    public ChainBase(Command commands[]) {
  +    public ChainBase(Command[] commands) {
   
           if (commands == null) {
               throw new IllegalArgumentException();
  @@ -114,7 +114,7 @@
        * the order in which they may delegate processing to the remainder of
        * the {@link Chain}.</p>
        */
  -    protected Command commands[] = new Command[0];
  +    protected Command[] commands = new Command[0];
   
   
       /**
  @@ -136,7 +136,7 @@
           if (frozen) {
               throw new IllegalStateException();
           }
  -        Command results[] = new Command[commands.length + 1];
  +        Command[] results = new Command[commands.length + 1];
           System.arraycopy(commands, 0, results, 0, commands.length);
           results[commands.length] = command;
           commands = results;
  @@ -170,7 +170,7 @@
               } catch (Exception e) {
                   saveException = e;
                   break;
  -            }   
  +            }
           }
   
           // Call postprocess methods on Filters in reverse order
  
  
  
  1.7       +17 -17    jakarta-commons/chain/src/java/org/apache/commons/chain/impl/ContextBase.java
  
  Index: ContextBase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/impl/ContextBase.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ContextBase.java	25 Feb 2004 00:01:06 -0000	1.6
  +++ ContextBase.java	30 Nov 2004 05:52:23 -0000	1.7
  @@ -102,7 +102,7 @@
       /**
        * <p>The same <code>PropertyDescriptor</code>s as an array.</p>
        */
  -    private PropertyDescriptor pd[] = null;
  +    private PropertyDescriptor[] pd = null;
   
   
       /**
  @@ -127,7 +127,7 @@
        * <p>Zero-length array of parameter values for calling property getters.
        * </p>
        */
  -    private static Object zeroParams[] = new Object[0];
  +    private static Object[] zeroParams = new Object[0];
   
   
       // ------------------------------------------------------------- Map Methods
  @@ -188,7 +188,7 @@
               }
           }
           return (false);
  -        
  +
       }
   
   
  @@ -415,10 +415,10 @@
               }
           }
           if (j < 0) {
  -            throw new IllegalArgumentException("Property '" + name +
  -                                               "' is not present");
  +            throw new IllegalArgumentException("Property '" + name
  +                                               + "' is not present");
           }
  -        PropertyDescriptor results[] = new PropertyDescriptor[pd.length - 1];
  +        PropertyDescriptor[] results = new PropertyDescriptor[pd.length - 1];
           System.arraycopy(pd, 0, results, 0, j);
           System.arraycopy(pd, j + 1, results, j, pd.length - (j + 1));
           pd = results;
  @@ -506,14 +506,14 @@
               Method method = descriptor.getReadMethod();
               if (method == null) {
                   throw new UnsupportedOperationException
  -                    ("Property '" + descriptor.getName() +
  -                     "' is not readable");
  +                    ("Property '" + descriptor.getName()
  +                     + "' is not readable");
               }
               return (method.invoke(this, zeroParams));
           } catch (Exception e) {
               throw new UnsupportedOperationException
  -                ("Exception reading property '" + descriptor.getName() +
  -                 "': " + e.getMessage());
  +                ("Exception reading property '" + descriptor.getName()
  +                 + "': " + e.getMessage());
           }
   
       }
  @@ -574,14 +574,14 @@
               Method method = descriptor.getWriteMethod();
               if (method == null) {
                   throw new UnsupportedOperationException
  -                    ("Property '" + descriptor.getName() +
  -                     "' is not writeable");
  +                    ("Property '" + descriptor.getName()
  +                     + "' is not writeable");
               }
               method.invoke(this, new Object[] { value });
           } catch (Exception e) {
               throw new UnsupportedOperationException
  -                ("Exception writing property '" + descriptor.getName() +
  -                 "': " + e.getMessage());
  +                ("Exception writing property '" + descriptor.getName()
  +                 + "': " + e.getMessage());
           }
   
       }
  @@ -705,8 +705,8 @@
           }
   
           public int hashCode() {
  -            return (((key == null) ? 0 : key.hashCode()) ^
  -                    ((value == null) ? 0 : value.hashCode()));
  +            return (((key == null) ? 0 : key.hashCode())
  +                   ^ ((value == null) ? 0 : value.hashCode()));
           }
   
           public Object setValue(Object value) {
  
  
  
  1.7       +16 -16    jakarta-commons/chain/src/java/org/apache/commons/chain/web/ChainListener.java
  
  Index: ChainListener.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/ChainListener.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ChainListener.java	18 Oct 2004 01:48:51 -0000	1.6
  +++ ChainListener.java	30 Nov 2004 05:52:23 -0000	1.7
  @@ -207,9 +207,9 @@
                   Class clazz = loader.loadClass(ruleSet);
                   parser.setRuleSet((RuleSet) clazz.newInstance());
               } catch (Exception e) {
  -                throw new RuntimeException("Exception initalizing RuleSet '" +
  -                                           ruleSet + "' instance: " +
  -                                           e.getMessage());
  +                throw new RuntimeException("Exception initalizing RuleSet '"
  +                                           + ruleSet + "' instance: "
  +                                           + e.getMessage());
               }
           }
   
  @@ -264,9 +264,9 @@
               URL resourceURL = null;
               try {
                   URL jarURL = context.getResource(path);
  -                resourceURL = new URL("jar:" +
  -                                      translate(jarURL.toExternalForm()) +
  -                                      "!/META-INF/chain-config.xml");
  +                resourceURL = new URL("jar:"
  +                                      + translate(jarURL.toExternalForm())
  +                                      + "!/META-INF/chain-config.xml");
                   if (resourceURL == null) {
                       continue;
                   }
  @@ -284,9 +284,9 @@
                   parser.parse(resourceURL);
               } catch (Exception e) {
                   throw new RuntimeException
  -                    ("Exception parsing chain config resource '" +
  -                     resourceURL.toExternalForm() + "': " +
  -                     e.getMessage());
  +                    ("Exception parsing chain config resource '"
  +                     + resourceURL.toExternalForm() + "': "
  +                     + e.getMessage());
               }
           }
   
  @@ -322,9 +322,9 @@
               URL resourceURL = null;
               try {
                   URL jarURL = context.getResource(path);
  -                resourceURL = new URL("jar:" +
  -                                      translate(jarURL.toExternalForm()) +
  -                                      "!/META-INF/chain-config.xml");
  +                resourceURL = new URL("jar:"
  +                                      + translate(jarURL.toExternalForm())
  +                                      + "!/META-INF/chain-config.xml");
                   if (resourceURL == null) {
                       continue;
                   }
  @@ -342,9 +342,9 @@
                   parser.parse(catalog, resourceURL);
               } catch (Exception e) {
                   throw new RuntimeException
  -                    ("Exception parsing chain config resource '" +
  -                     resourceURL.toExternalForm() + "': " +
  -                     e.getMessage());
  +                    ("Exception parsing chain config resource '"
  +                     + resourceURL.toExternalForm() + "': "
  +                     + e.getMessage());
               }
           }
   
  
  
  
  1.7       +8 -8      jakarta-commons/chain/src/java/org/apache/commons/chain/web/ChainResources.java
  
  Index: ChainResources.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/ChainResources.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ChainResources.java	18 Oct 2004 01:07:42 -0000	1.6
  +++ ChainResources.java	30 Nov 2004 05:52:23 -0000	1.7
  @@ -91,8 +91,8 @@
               }
           } catch (Exception e) {
               throw new RuntimeException
  -                ("Exception parsing chain config resource '" + path + "': " +
  -                 e.getMessage());
  +                ("Exception parsing chain config resource '" + path + "': "
  +                 + e.getMessage());
           }
   
       }
  @@ -145,8 +145,8 @@
               }
           } catch (Exception e) {
               throw new RuntimeException
  -                ("Exception parsing chain config resource '" + path + "': " +
  -                 e.getMessage());
  +                ("Exception parsing chain config resource '" + path + "': "
  +                 + e.getMessage());
           }
   
       }
  @@ -192,8 +192,8 @@
               }
           } catch (Exception e) {
               throw new RuntimeException
  -                ("Exception parsing chain config resource '" + path + "': " +
  -                 e.getMessage());
  +                ("Exception parsing chain config resource '" + path + "': "
  +                 + e.getMessage());
           }
   
       }
  @@ -243,8 +243,8 @@
               }
           } catch (Exception e) {
               throw new RuntimeException
  -                ("Exception parsing chain config resource '" + path + "': " +
  -                 e.getMessage());
  +                ("Exception parsing chain config resource '" + path + "': "
  +                 + e.getMessage());
           }
   
       }
  
  
  
  1.8       +7 -7      jakarta-commons/chain/src/java/org/apache/commons/chain/web/ChainServlet.java
  
  Index: ChainServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/ChainServlet.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ChainServlet.java	18 Oct 2004 01:48:51 -0000	1.7
  +++ ChainServlet.java	30 Nov 2004 05:52:23 -0000	1.8
  @@ -93,7 +93,7 @@
    */
   
   public class ChainServlet extends HttpServlet {
  -    
  +
   
       // ------------------------------------------------------ Manifest Constants
   
  @@ -167,12 +167,12 @@
        * @throws ServletException if the servlet could not be initialized
        */
       public void init() throws ServletException {
  -        
  +
           ServletConfig config = getServletConfig();
           ServletContext context = getServletContext();
           if (log.isInfoEnabled()) {
  -            log.info("Initializing chain servlet '" +
  -                     config.getServletName() + "'");
  +            log.info("Initializing chain servlet '"
  +                     + config.getServletName() + "'");
           }
   
           // Retrieve servlet init parameters that we need
  @@ -203,8 +203,8 @@
                   Class clazz = loader.loadClass(ruleSet);
                   parser.setRuleSet((RuleSet) clazz.newInstance());
               } catch (Exception e) {
  -                throw new ServletException("Exception initalizing RuleSet '" +
  -                                           ruleSet + "' instance", e);
  +                throw new ServletException("Exception initalizing RuleSet '"
  +                                           + ruleSet + "' instance", e);
               }
           }
   
  @@ -225,7 +225,7 @@
           if (attr != null) {
               context.setAttribute(attr, catalog);
           }
  -        
  +
       }
   
   
  
  
  
  1.3       +15 -15    jakarta-commons/chain/src/java/org/apache/commons/chain/web/MapEntry.java
  
  Index: MapEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/MapEntry.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MapEntry.java	17 Oct 2004 01:53:53 -0000	1.2
  +++ MapEntry.java	30 Nov 2004 05:52:23 -0000	1.3
  @@ -47,7 +47,7 @@
   
       /**
        * <p>Creates a map entry that can either allow modifications or not.</p>
  -     * 
  +     *
        * @param key The entry key
        * @param value The entry value
        * @param modifiable Whether the entry should allow modification or not
  @@ -61,7 +61,7 @@
   
       /**
        * <p>Gets the entry key.</p>
  -     * 
  +     *
        * @return The entry key
        */
       public Object getKey() {
  @@ -71,7 +71,7 @@
   
       /**
        * <p>Gets the entry value.</p>
  -     * 
  +     *
        * @return The entry key
        */
       public Object getValue() {
  @@ -81,7 +81,7 @@
   
       /**
        * <p>Sets the entry value if the entry can be modified.</p>
  -     * 
  +     *
        * @param val The new value
        * @return The old entry value
        * @throws UnsupportedOperationException If the entry cannot be modified
  @@ -99,29 +99,29 @@
   
       /**
        * <p>Determines if this entry is equal to the passed object.</p>
  -     * 
  +     *
        * @param o The object to test
        * @return True if equal, else false
        */
       public boolean equals(Object o) {
           if (o != null && o instanceof Map.Entry) {
  -            Map.Entry entry = (Map.Entry)o; 
  -            return (this.getKey()==null ?
  -                    entry.getKey()==null : this.getKey().equals(entry.getKey()))  &&
  -                   (this.getValue()==null ?
  -                    entry.getValue()==null : this.getValue().equals(entry.getValue()));
  +            Map.Entry entry = (Map.Entry)o;
  +            return (this.getKey() == null ?
  +                    entry.getKey() == null : this.getKey().equals(entry.getKey()))  &&
  +                   (this.getValue() == null ?
  +                    entry.getValue() == null : this.getValue().equals(entry.getValue()));
           }
           return false;
  -    }    
  +    }
   
   
       /**
        * <p>Returns the hashcode for this entry.</p>
  -     * 
  +     *
        * @return The and'ed hashcode of the key and value
        */
       public int hashCode() {
  -        return (this.getKey()==null   ? 0 : this.getKey().hashCode()) ^
  -               (this.getValue()==null ? 0 : this.getValue().hashCode());
  +        return (this.getKey() == null   ? 0 : this.getKey().hashCode()) ^
  +               (this.getValue() == null ? 0 : this.getValue().hashCode());
       }
   }
  
  
  
  1.6       +1 -2      jakarta-commons/chain/src/java/org/apache/commons/chain/web/WebContext.java
  
  Index: WebContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/WebContext.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- WebContext.java	25 Feb 2004 00:01:06 -0000	1.5
  +++ WebContext.java	30 Nov 2004 05:52:23 -0000	1.6
  @@ -17,7 +17,6 @@
   
   
   import java.util.Map;
  -import org.apache.commons.chain.Context;
   import org.apache.commons.chain.impl.ContextBase;
   
   
  
  
  
  1.4       +2 -2      jakarta-commons/chain/src/java/org/apache/commons/chain/web/portlet/PortletApplicationScopeMap.java
  
  Index: PortletApplicationScopeMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/portlet/PortletApplicationScopeMap.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PortletApplicationScopeMap.java	25 Feb 2004 00:01:06 -0000	1.3
  +++ PortletApplicationScopeMap.java	30 Nov 2004 05:52:23 -0000	1.4
  @@ -44,7 +44,7 @@
   
   
       private PortletContext context = null;
  - 
  +
   
       public void clear() {
           Iterator keys = keySet().iterator();
  
  
  
  1.4       +2 -2      jakarta-commons/chain/src/java/org/apache/commons/chain/web/portlet/PortletRequestScopeMap.java
  
  Index: PortletRequestScopeMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/portlet/PortletRequestScopeMap.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PortletRequestScopeMap.java	25 Feb 2004 00:01:06 -0000	1.3
  +++ PortletRequestScopeMap.java	30 Nov 2004 05:52:23 -0000	1.4
  @@ -44,7 +44,7 @@
   
   
       private PortletRequest request = null;
  - 
  +
   
       public void clear() {
           Iterator keys = keySet().iterator();
  
  
  
  1.5       +2 -2      jakarta-commons/chain/src/java/org/apache/commons/chain/web/portlet/PortletSessionScopeMap.java
  
  Index: PortletSessionScopeMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/portlet/PortletSessionScopeMap.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PortletSessionScopeMap.java	25 Feb 2004 00:01:06 -0000	1.4
  +++ PortletSessionScopeMap.java	30 Nov 2004 05:52:23 -0000	1.5
  @@ -44,7 +44,7 @@
   
   
       private PortletSession session = null;
  - 
  +
   
       public void clear() {
           Iterator keys = keySet().iterator();
  
  
  
  1.7       +0 -1      jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet/ChainProcessor.java
  
  Index: ChainProcessor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet/ChainProcessor.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ChainProcessor.java	18 Oct 2004 01:48:52 -0000	1.6
  +++ ChainProcessor.java	30 Nov 2004 05:52:23 -0000	1.7
  @@ -23,7 +23,6 @@
   import org.apache.commons.chain.Catalog;
   import org.apache.commons.chain.CatalogFactory;
   import org.apache.commons.chain.Command;
  -import org.apache.commons.chain.Context;
   import org.apache.commons.chain.web.ChainServlet;
   
   
  
  
  
  1.5       +2 -2      jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet/ServletApplicationScopeMap.java
  
  Index: ServletApplicationScopeMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet/ServletApplicationScopeMap.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ServletApplicationScopeMap.java	10 Sep 2004 22:43:20 -0000	1.4
  +++ ServletApplicationScopeMap.java	30 Nov 2004 05:52:23 -0000	1.5
  @@ -45,7 +45,7 @@
   
   
       private ServletContext context = null;
  - 
  +
   
       public void clear() {
           Iterator keys = keySet().iterator();
  
  
  
  1.5       +3 -3      jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet/ServletHeaderValuesMap.java
  
  Index: ServletHeaderValuesMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet/ServletHeaderValuesMap.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ServletHeaderValuesMap.java	10 Sep 2004 22:43:20 -0000	1.4
  +++ ServletHeaderValuesMap.java	30 Nov 2004 05:52:23 -0000	1.5
  @@ -61,10 +61,10 @@
           if (!(value instanceof String[])) {
               return (false);
           }
  -        String test[] = (String[]) value;
  +        String[] test = (String[]) value;
           Iterator values = values().iterator();
           while (values.hasNext()) {
  -            String actual[] = (String[]) values.next();
  +            String[] actual = (String[]) values.next();
               if (test.length == actual.length) {
                   boolean matched = true;
                   for (int i = 0; i < test.length; i++) {
  
  
  
  1.5       +2 -2      jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet/ServletRequestScopeMap.java
  
  Index: ServletRequestScopeMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet/ServletRequestScopeMap.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ServletRequestScopeMap.java	10 Sep 2004 22:43:20 -0000	1.4
  +++ ServletRequestScopeMap.java	30 Nov 2004 05:52:23 -0000	1.5
  @@ -45,7 +45,7 @@
   
   
       private HttpServletRequest request = null;
  - 
  +
   
       public void clear() {
           Iterator keys = keySet().iterator();
  
  
  
  1.5       +2 -2      jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet/ServletSessionScopeMap.java
  
  Index: ServletSessionScopeMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/chain/src/java/org/apache/commons/chain/web/servlet/ServletSessionScopeMap.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ServletSessionScopeMap.java	10 Sep 2004 22:43:20 -0000	1.4
  +++ ServletSessionScopeMap.java	30 Nov 2004 05:52:23 -0000	1.5
  @@ -45,7 +45,7 @@
   
   
       private HttpSession session = null;
  - 
  +
   
       public void clear() {
           Iterator keys = keySet().iterator();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message