avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon/src/java/org/apache/avalon/framework/service DefaultServiceManager.java DefaultServiceSelector.java ServiceManager.java ServiceSelector.java Serviceable.java
Date Fri, 10 May 2002 03:00:49 GMT
donaldp     02/05/09 20:00:49

  Modified:    src/java/org/apache/avalon/framework Version.java
               src/java/org/apache/avalon/framework/activity
                        Executable.java Initializable.java Startable.java
               src/java/org/apache/avalon/framework/component
                        ComponentManager.java ComponentSelector.java
                        Composable.java DefaultComponentManager.java
                        DefaultComponentSelector.java Recomposable.java
               src/java/org/apache/avalon/framework/configuration
                        AbstractConfiguration.java Configurable.java
                        Configuration.java DefaultConfiguration.java
                        DefaultConfigurationBuilder.java
                        DefaultConfigurationSerializer.java
                        NamespacedSAXConfigurationHandler.java
                        Reconfigurable.java SAXConfigurationHandler.java
               src/java/org/apache/avalon/framework/context Context.java
                        Contextualizable.java DefaultContext.java
                        Recontextualizable.java Resolvable.java
               src/java/org/apache/avalon/framework/parameters
                        Parameterizable.java Parameters.java
                        Reparameterizable.java
               src/java/org/apache/avalon/framework/service
                        DefaultServiceManager.java
                        DefaultServiceSelector.java ServiceManager.java
                        ServiceSelector.java Serviceable.java
  Log:
  @exception --> @throws
  
  Revision  Changes    Path
  1.13      +12 -12    jakarta-avalon/src/java/org/apache/avalon/framework/Version.java
  
  Index: Version.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/Version.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Version.java	21 Mar 2002 14:51:12 -0000	1.12
  +++ Version.java	10 May 2002 03:00:47 -0000	1.13
  @@ -55,8 +55,8 @@
        *
        * @param version The input version string
        * @return the new Version object
  -     * @exception NumberFormatException if an error occurs
  -     * @exception IllegalArgumentException if an error occurs
  +     * @throws NumberFormatException if an error occurs
  +     * @throws IllegalArgumentException if an error occurs
        */
       public static Version getVersion( final String version )
           throws NumberFormatException, IllegalArgumentException
  @@ -70,16 +70,16 @@
   
           final int major = Integer.parseInt( levels[ 0 ] );
   
  -        int minor = 0;       
  -        if( 1 < levels.length ) 
  -        { 
  -            minor = Integer.parseInt( levels[ 1 ] ); 
  +        int minor = 0;
  +        if( 1 < levels.length )
  +        {
  +            minor = Integer.parseInt( levels[ 1 ] );
           }
   
           int micro = 0;
  -        if( 2 < levels.length ) 
  -        { 
  -            micro = Integer.parseInt( levels[ 2 ] ); 
  +        if( 2 < levels.length )
  +        {
  +            micro = Integer.parseInt( levels[ 2 ] );
           }
   
           return new Version( major, minor, micro );
  @@ -187,7 +187,7 @@
        * If this <code>Version</code> is compatible with the specified one, then
        * <b>true</b> is returned, otherwise <b>false</b>. Be careful when using
        * this method since, in example, version 1.3.7 is compliant to version
  -     * 1.3.6, while the opposite is not. 
  +     * 1.3.6, while the opposite is not.
        * <p />
        * The following example displays the expected behaviour and results of version.
        * <pre>
  @@ -195,7 +195,7 @@
        * final Version v2 = new Version( 1, 3 , 7 );
        * final Version v3 = new Version( 1, 4 , 0 );
        * final Version v4 = new Version( 2, 0 , 1 );
  -     * 
  +     *
        * assert(   v1.complies( v1 ) );
        * assert( ! v1.complies( v2 ) );
        * assert(   v2.complies( v1 ) );
  @@ -223,7 +223,7 @@
           else if( m_minor == other.m_minor &&
                    m_micro < other.m_micro )
           {
  -            //If same major version, same minor version but lower micro level 
  +            //If same major version, same minor version but lower micro level
               //then incompatible
               return false;
           }
  
  
  
  1.4       +1 -1      jakarta-avalon/src/java/org/apache/avalon/framework/activity/Executable.java
  
  Index: Executable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/activity/Executable.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Executable.java	11 Dec 2001 09:00:44 -0000	1.3
  +++ Executable.java	10 May 2002 03:00:47 -0000	1.4
  @@ -22,7 +22,7 @@
       /**
        * Execute the action associated with this component.
        *
  -     * @exception Exception if an error occurs
  +     * @throws Exception if an error occurs
        */
       void execute()
           throws Exception;
  
  
  
  1.5       +4 -4      jakarta-avalon/src/java/org/apache/avalon/framework/activity/Initializable.java
  
  Index: Initializable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/activity/Initializable.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Initializable.java	11 Dec 2001 09:00:44 -0000	1.4
  +++ Initializable.java	10 May 2002 03:00:47 -0000	1.5
  @@ -8,7 +8,7 @@
   package org.apache.avalon.framework.activity;
   
   /**
  - * The Initializable interface is used by components that need to 
  + * The Initializable interface is used by components that need to
    * allocate resources prior to them becoming active.
    *
    * @author <a href="mailto:fede@apache.org">Federico Barbieri</a>
  @@ -19,11 +19,11 @@
   public interface Initializable
   {
       /**
  -     * Initialialize the component. Initialization includes 
  -     * allocating any resources required throughout the 
  +     * Initialialize the component. Initialization includes
  +     * allocating any resources required throughout the
        * components lifecycle.
        *
  -     * @exception Exception if an error occurs
  +     * @throws Exception if an error occurs
        */
       void initialize()
           throws Exception;
  
  
  
  1.5       +5 -5      jakarta-avalon/src/java/org/apache/avalon/framework/activity/Startable.java
  
  Index: Startable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/activity/Startable.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Startable.java	11 Dec 2001 09:00:44 -0000	1.4
  +++ Startable.java	10 May 2002 03:00:47 -0000	1.5
  @@ -9,9 +9,9 @@
   
   /**
    * The Startable interface is used when components need to
  - * be "running" to be active. It provides a method through 
  - * which components can be "started" and "stopped" without 
  - * requiring a thread. 
  + * be "running" to be active. It provides a method through
  + * which components can be "started" and "stopped" without
  + * requiring a thread.
    * Note that these methods should start the component but return
    * imediately.
    *
  @@ -23,7 +23,7 @@
       /**
        * Starts the component.
        *
  -     * @exception Exception if Component can not be started
  +     * @throws Exception if Component can not be started
        */
       void start()
           throws Exception;
  @@ -31,7 +31,7 @@
       /**
        * Stops the component.
        *
  -     * @exception Exception if the Component can not be Stopped.
  +     * @throws Exception if the Component can not be Stopped.
        */
       void stop()
           throws Exception;
  
  
  
  1.6       +1 -1      jakarta-avalon/src/java/org/apache/avalon/framework/component/ComponentManager.java
  
  Index: ComponentManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/component/ComponentManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ComponentManager.java	21 Mar 2002 14:51:13 -0000	1.5
  +++ ComponentManager.java	10 May 2002 03:00:47 -0000	1.6
  @@ -62,7 +62,7 @@
        *
        * @param role The role name of the <code>Component</code> to retrieve.
        * @return the desired component
  -     * @exception ComponentException if an error occurs
  +     * @throws ComponentException if an error occurs
        */
       Component lookup( String role )
           throws ComponentException;
  
  
  
  1.6       +3 -3      jakarta-avalon/src/java/org/apache/avalon/framework/component/ComponentSelector.java
  
  Index: ComponentSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/component/ComponentSelector.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ComponentSelector.java	21 Mar 2002 14:51:13 -0000	1.5
  +++ ComponentSelector.java	10 May 2002 03:00:47 -0000	1.6
  @@ -58,9 +58,9 @@
        *
        * @param hint A hint to retrieve the correct <code>Component</code>.
        * @return the desired component
  -     * @exception ComponentException If the given role is not associated
  -     *                               with a <code>Component</code>, or a 
  -     *                               <code>Component</code> instance cannot 
  +     * @throws ComponentException If the given role is not associated
  +     *                               with a <code>Component</code>, or a
  +     *                               <code>Component</code> instance cannot
        *                               be created.
        */
       Component select( Object hint )
  
  
  
  1.5       +3 -3      jakarta-avalon/src/java/org/apache/avalon/framework/component/Composable.java
  
  Index: Composable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/component/Composable.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Composable.java	21 Mar 2002 14:51:13 -0000	1.4
  +++ Composable.java	10 May 2002 03:00:48 -0000	1.5
  @@ -17,8 +17,8 @@
    * The <code>Composable</code> is able to use <code>Components</code> managed
    * by the <code>ComponentManager</code> it was initialized with.  As part
    * of the contract with the system, the instantiating entity must call
  - * the <code>compose</code> method before the <code>Composable</code> 
  - * can be considered valid. 
  + * the <code>compose</code> method before the <code>Composable</code>
  + * can be considered valid.
    *
    * @author <a href="mailto:fede@apache.org">Federico Barbieri</a>
    * @author <a href="mailto:pier@apache.org">Pierpaolo Fumagalli</a>
  @@ -35,7 +35,7 @@
        *
        * @param componentManager The <code>ComponentManager</code> which this
        *                <code>Composable</code> uses.
  -     * @exception ComponentException if an error occurs
  +     * @throws ComponentException if an error occurs
        */
       void compose( ComponentManager componentManager )
           throws ComponentException;
  
  
  
  1.10      +3 -3      jakarta-avalon/src/java/org/apache/avalon/framework/component/DefaultComponentManager.java
  
  Index: DefaultComponentManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/component/DefaultComponentManager.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DefaultComponentManager.java	21 Mar 2002 14:51:13 -0000	1.9
  +++ DefaultComponentManager.java	10 May 2002 03:00:48 -0000	1.10
  @@ -51,7 +51,7 @@
        *
        * @param role the role
        * @return the Component
  -     * @exception ComponentException if an error occurs
  +     * @throws ComponentException if an error occurs
        */
       public Component lookup( final String role )
           throws ComponentException
  @@ -79,7 +79,7 @@
        * @param role role of the component you are lokking for
        * @return <code>true</code> if the component manager has a component with that role
        */
  -    public boolean hasComponent( final String role ) 
  +    public boolean hasComponent( final String role )
       {
           boolean componentExists = false;
   
  @@ -171,7 +171,7 @@
       /**
        * Check if this component manager is writeable.
        *
  -     * @exception IllegalStateException if this component manager is read-only
  +     * @throws IllegalStateException if this component manager is read-only
        */
       protected final void checkWriteable()
           throws IllegalStateException
  
  
  
  1.8       +3 -3      jakarta-avalon/src/java/org/apache/avalon/framework/component/DefaultComponentSelector.java
  
  Index: DefaultComponentSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/component/DefaultComponentSelector.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DefaultComponentSelector.java	21 Mar 2002 14:51:13 -0000	1.7
  +++ DefaultComponentSelector.java	10 May 2002 03:00:48 -0000	1.8
  @@ -28,7 +28,7 @@
        *
        * @param hint the hint to retrieve Component
        * @return the Component
  -     * @exception ComponentException if an error occurs
  +     * @throws ComponentException if an error occurs
        */
       public Component select( Object hint )
           throws ComponentException
  @@ -51,7 +51,7 @@
        * @param hint the hint to retrieve Component
        * @return <code>true</code> if the Component exists
        */
  -    public boolean hasComponent( final Object hint ) 
  +    public boolean hasComponent( final Object hint )
       {
           boolean componentExists = false;
   
  @@ -111,7 +111,7 @@
       /**
        * Check if this component manager is writeable.
        *
  -     * @exception IllegalStateException if this component manager is read-only
  +     * @throws IllegalStateException if this component manager is read-only
        */
       protected final void checkWriteable()
           throws IllegalStateException
  
  
  
  1.6       +2 -2      jakarta-avalon/src/java/org/apache/avalon/framework/component/Recomposable.java
  
  Index: Recomposable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/component/Recomposable.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Recomposable.java	21 Mar 2002 14:51:13 -0000	1.5
  +++ Recomposable.java	10 May 2002 03:00:48 -0000	1.6
  @@ -20,12 +20,12 @@
        * Repass the <code>ComponentManager</code> to the <code>composer</code>.
        * The <code>Composable</code> implementation should use the specified
        * <code>ComponentManager</code> to acquire the components it needs for
  -     * execution. It should also drop references to any components it 
  +     * execution. It should also drop references to any components it
        * retrieved from old ComponentManager.
        *
        * @param componentManager The <code>ComponentManager</code> which this
        *                <code>Composable</code> uses.
  -     * @exception ComponentException if an error occurs
  +     * @throws ComponentException if an error occurs
        */
       void recompose( ComponentManager componentManager )
           throws ComponentException;
  
  
  
  1.15      +9 -9      jakarta-avalon/src/java/org/apache/avalon/framework/configuration/AbstractConfiguration.java
  
  Index: AbstractConfiguration.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/configuration/AbstractConfiguration.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- AbstractConfiguration.java	9 May 2002 09:59:40 -0000	1.14
  +++ AbstractConfiguration.java	10 May 2002 03:00:48 -0000	1.15
  @@ -16,7 +16,7 @@
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
    * @author <a href="mailto:leo.sutic@inspireinfrastructure.com">Leo Sutic</a>
  - * @version CVS $Revision: 1.14 $ $Date: 2002/05/09 09:59:40 $
  + * @version CVS $Revision: 1.15 $ $Date: 2002/05/10 03:00:48 $
    */
   public abstract class AbstractConfiguration
       implements Configuration
  @@ -37,7 +37,7 @@
        * Hexadecimal numbers begin with 0x, Octal numbers begin with 0o and binary
        * numbers begin with 0b, all other values are assumed to be decimal.
        *
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        * @return the value
        */
       public int getValueAsInteger()
  @@ -98,7 +98,7 @@
        * Hexadecimal numbers begin with 0x, Octal numbers begin with 0o and binary
        * numbers begin with 0b, all other values are assumed to be decimal.
        *
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        * @return the value
        */
       public long getValueAsLong()
  @@ -156,7 +156,7 @@
       /**
        * Returns the value of the configuration element as a <code>float</code>.
        *
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        * @return the value
        */
       public float getValueAsFloat()
  @@ -196,7 +196,7 @@
       /**
        * Returns the value of the configuration element as a <code>boolean</code>.
        *
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        * @return the value
        */
       public boolean getValueAsBoolean()
  @@ -263,7 +263,7 @@
        * numbers begin with 0b, all other values are assumed to be decimal.
        *
        * @param name the name of the attribute
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        * @return the value
        */
       public int getAttributeAsInteger( final String name )
  @@ -328,7 +328,7 @@
        * numbers begin with 0b, all other values are assumed to be decimal.
        *
        * @param name the name of the attribute
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        * @return the value
        */
       public long getAttributeAsLong( final String name )
  @@ -391,7 +391,7 @@
        * <code>float</code>.
        *
        * @param name the name of the attribute
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        * @return the value
        */
       public float getAttributeAsFloat( final String name )
  @@ -435,7 +435,7 @@
        * <code>boolean</code>.
        *
        * @param name the name of the attribute
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        * @return the value
        */
       public boolean getAttributeAsBoolean( final String name )
  
  
  
  1.6       +2 -2      jakarta-avalon/src/java/org/apache/avalon/framework/configuration/Configurable.java
  
  Index: Configurable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/configuration/Configurable.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Configurable.java	21 Mar 2002 14:51:13 -0000	1.5
  +++ Configurable.java	10 May 2002 03:00:48 -0000	1.6
  @@ -17,7 +17,7 @@
    * method before it is valid.  The <code>configure</code> method
    * must be called after the constructor, and before any other method.
    * <br/>
  - * 
  + *
    * Note that this interface is incompatible with Parameterizable.
    *
    * @author <a href="mailto:fede@apache.org">Federico Barbieri</a>
  @@ -35,7 +35,7 @@
        * and before any other method.
        *
        * @param configuration the class configurations.
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       void configure( Configuration configuration )
           throws ConfigurationException;
  
  
  
  1.17      +11 -11    jakarta-avalon/src/java/org/apache/avalon/framework/configuration/Configuration.java
  
  Index: Configuration.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/configuration/Configuration.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Configuration.java	21 Mar 2002 15:06:13 -0000	1.16
  +++ Configuration.java	10 May 2002 03:00:48 -0000	1.17
  @@ -171,7 +171,7 @@
        * <code>bar</code> will be "http://blah.com".</p>
        *
        * @return a String identifying the namespace of this Configuration.
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        * @since 4.1
        */
       String getNamespace() throws ConfigurationException;
  @@ -254,7 +254,7 @@
        *
        * @param paramName The name of the parameter you ask the value of.
        * @return String value of attribute.
  -     * @exception ConfigurationException If no attribute with that name exists.
  +     * @throws ConfigurationException If no attribute with that name exists.
        * @pre paramName != null
        * @post getAttribute != null
        *
  @@ -267,7 +267,7 @@
        *
        * @param paramName The name of the parameter you ask the value of.
        * @return int value of attribute
  -     * @exception ConfigurationException If no parameter with that name exists.
  +     * @throws ConfigurationException If no parameter with that name exists.
        *                                   or if conversion to <code>int</code> fails.
        * @pre paramName != null
        * @post getAttributeAsInteger() != null
  @@ -281,7 +281,7 @@
        *
        * @param name The name of the parameter you ask the value of.
        * @return long value of attribute
  -     * @exception ConfigurationException If no parameter with that name exists.
  +     * @throws ConfigurationException If no parameter with that name exists.
        *                                   or if conversion to <code>long</code> fails.
        * @pre paramName != null
        * @post getAttributeAsLong() != null
  @@ -295,7 +295,7 @@
        *
        * @param paramName The name of the parameter you ask the value of.
        * @return float value of attribute
  -     * @exception ConfigurationException If no parameter with that name exists.
  +     * @throws ConfigurationException If no parameter with that name exists.
        *                                   or if conversion to <code>float</code> fails.
        * @pre paramName != null
        * @post getAttributeAsFloat() != null
  @@ -309,7 +309,7 @@
        *
        * @param paramName The name of the parameter you ask the value of.
        * @return boolean value of attribute
  -     * @exception ConfigurationException If no parameter with that name exists.
  +     * @throws ConfigurationException If no parameter with that name exists.
        *                                   or if conversion to <code>boolean</code> fails.
        * @pre paramName != null
        * @post getAttributeAsBoolean() != null
  @@ -321,7 +321,7 @@
        * Return the <code>String</code> value of the node.
        *
        * @return the value of the node.
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        * @post getValue() != null
        *
        */
  @@ -332,7 +332,7 @@
        *
        * @return the value of the node.
        *
  -     * @exception ConfigurationException If conversion to <code>int</code> fails.
  +     * @throws ConfigurationException If conversion to <code>int</code> fails.
        * @post getValueAsInteger() != null
        *
        */
  @@ -342,7 +342,7 @@
        * Return the <code>float</code> value of the node.
        *
        * @return the value of the node.
  -     * @exception ConfigurationException If conversion to <code>float</code> fails.
  +     * @throws ConfigurationException If conversion to <code>float</code> fails.
        * @post getValueAsFloat() != null
        *
        */
  @@ -352,7 +352,7 @@
        * Return the <code>boolean</code> value of the node.
        *
        * @return the value of the node.
  -     * @exception ConfigurationException If conversion to <code>boolean</code> fails.
  +     * @throws ConfigurationException If conversion to <code>boolean</code> fails.
        * @post getValueAsBoolean() != null
        *
        */
  @@ -362,7 +362,7 @@
        * Return the <code>long</code> value of the node.
        *
        * @return the value of the node.
  -     * @exception ConfigurationException If conversion to <code>long</code> fails.
  +     * @throws ConfigurationException If conversion to <code>long</code> fails.
        * @post getValueAsLong() != null
        *
        */
  
  
  
  1.18      +6 -6      jakarta-avalon/src/java/org/apache/avalon/framework/configuration/DefaultConfiguration.java
  
  Index: DefaultConfiguration.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/configuration/DefaultConfiguration.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- DefaultConfiguration.java	16 Apr 2002 12:13:59 -0000	1.17
  +++ DefaultConfiguration.java	10 May 2002 03:00:48 -0000	1.18
  @@ -81,7 +81,7 @@
       /**
        * Returns the namespace of this configuration element
        * @return a <code>String</code> value
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       public String getNamespace() throws ConfigurationException
       {
  @@ -101,7 +101,7 @@
       /**
        * Returns the prefix of the namespace
        * @return a <code>String</code> value
  -     * @exception ConfigurationException if prefix is not present (<code>null</code>).
  +     * @throws ConfigurationException if prefix is not present (<code>null</code>).
        */
       protected String getPrefix() throws ConfigurationException
       {
  @@ -135,7 +135,7 @@
        * @param defaultValue the default value to return if value malformed or empty
        * @return a <code>String</code> value
        */
  -    public String getValue( final String defaultValue ) 
  +    public String getValue( final String defaultValue )
       {
           if( null != m_value )
           {
  @@ -151,7 +151,7 @@
        * Returns the value of the configuration element as a <code>String</code>.
        *
        * @return a <code>String</code> value
  -     * @exception ConfigurationException If the value is not present.
  +     * @throws ConfigurationException If the value is not present.
        */
       public String getValue() throws ConfigurationException
       {
  @@ -207,7 +207,7 @@
        *
        * @param name a <code>String</code> value
        * @return a <code>String</code> value
  -     * @exception ConfigurationException If the attribute is not present.
  +     * @throws ConfigurationException If the attribute is not present.
        */
       public String getAttribute( final String name )
           throws ConfigurationException
  @@ -419,7 +419,7 @@
       /**
        * heck if this configuration is writeable.
        *
  -     * @exception IllegalStateException if this configuration s read-only
  +     * @throws IllegalStateException if this configuration s read-only
        */
       protected final void checkWriteable()
           throws IllegalStateException
  
  
  
  1.16      +15 -15    jakarta-avalon/src/java/org/apache/avalon/framework/configuration/DefaultConfigurationBuilder.java
  
  Index: DefaultConfigurationBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/configuration/DefaultConfigurationBuilder.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- DefaultConfigurationBuilder.java	6 May 2002 19:23:04 -0000	1.15
  +++ DefaultConfigurationBuilder.java	10 May 2002 03:00:48 -0000	1.16
  @@ -149,9 +149,9 @@
        * Build a configuration object from a file using a filename.
        * @param filename name of the file
        * @return a <code>Configuration</code> object
  -     * @exception SAXException if a parsing error occurs
  -     * @exception IOException if an I/O error occurs
  -     * @exception ConfigurationException if an error occurs
  +     * @throws SAXException if a parsing error occurs
  +     * @throws IOException if an I/O error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       public Configuration buildFromFile( final String filename )
           throws SAXException, IOException, ConfigurationException
  @@ -163,9 +163,9 @@
        * Build a configuration object from a file using a File object.
        * @param file a <code>File</code> object
        * @return a <code>Configuration</code> object
  -     * @exception SAXException if a parsing error occurs
  -     * @exception IOException if an I/O error occurs
  -     * @exception ConfigurationException if an error occurs
  +     * @throws SAXException if a parsing error occurs
  +     * @throws IOException if an I/O error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       public Configuration buildFromFile( final File file )
           throws SAXException, IOException, ConfigurationException
  @@ -182,9 +182,9 @@
        * Build a configuration object using an InputStream.
        * @param inputStream an <code>InputStream</code> value
        * @return a <code>Configuration</code> object
  -     * @exception SAXException if a parsing error occurs
  -     * @exception IOException if an I/O error occurs
  -     * @exception ConfigurationException if an error occurs
  +     * @throws SAXException if a parsing error occurs
  +     * @throws IOException if an I/O error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       public Configuration build( final InputStream inputStream )
           throws SAXException, IOException, ConfigurationException
  @@ -196,9 +196,9 @@
        * Build a configuration object using an URI
        * @param uri a <code>String</code> value
        * @return a <code>Configuration</code> object
  -     * @exception SAXException if a parsing error occurs
  -     * @exception IOException if an I/O error occurs
  -     * @exception ConfigurationException if an error occurs
  +     * @throws SAXException if a parsing error occurs
  +     * @throws IOException if an I/O error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       public Configuration build( final String uri )
           throws SAXException, IOException, ConfigurationException
  @@ -210,9 +210,9 @@
        * Build a configuration object using an XML InputSource object
        * @param input an <code>InputSource</code> value
        * @return a <code>Configuration</code> object
  -     * @exception SAXException if a parsing error occurs
  -     * @exception IOException if an I/O error occurs
  -     * @exception ConfigurationException if an error occurs
  +     * @throws SAXException if a parsing error occurs
  +     * @throws IOException if an I/O error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       public Configuration build( final InputSource input )
           throws SAXException, IOException, ConfigurationException
  
  
  
  1.11      +18 -18    jakarta-avalon/src/java/org/apache/avalon/framework/configuration/DefaultConfigurationSerializer.java
  
  Index: DefaultConfigurationSerializer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/configuration/DefaultConfigurationSerializer.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DefaultConfigurationSerializer.java	21 Mar 2002 14:51:13 -0000	1.10
  +++ DefaultConfigurationSerializer.java	10 May 2002 03:00:48 -0000	1.11
  @@ -43,7 +43,7 @@
       {
           getTransformerFactory();
       }
  -    
  +
       /**
        * Sets the Serializer's use of indentation.  This will cause linefeeds to be added
        *  after each element, but it does not add any indentation via spaces.
  @@ -74,7 +74,7 @@
               m_format.put(OutputKeys.METHOD,"xml");
               m_handler.setResult(new StreamResult(out));
               m_handler.getTransformer().setOutputProperties( m_format );
  -        } 
  +        }
           catch( final Exception e )
           {
               throw new RuntimeException( e.toString() );
  @@ -100,8 +100,8 @@
        * Start the serialization process.  The output stream <strong>must</strong>
        * be set before calling this method.
        * @param source a <code>Configuration</code> value
  -     * @exception SAXException if an error occurs
  -     * @exception ConfigurationException if an error occurs
  +     * @throws SAXException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       protected void serialize( final Configuration source )
           throws SAXException, ConfigurationException
  @@ -115,8 +115,8 @@
       /**
        * Serialize each Configuration element.  This method is called recursively.
        * @param element a <code>Configuration</code> value
  -     * @exception SAXException if an error occurs
  -     * @exception ConfigurationException if an error occurs
  +     * @throws SAXException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       protected void serializeElement( final Configuration element )
           throws SAXException, ConfigurationException
  @@ -218,9 +218,9 @@
        * Serialize the configuration object to a file using a filename.
        * @param filename a <code>String</code> value
        * @param source a <code>Configuration</code> value
  -     * @exception SAXException if an error occurs
  -     * @exception IOException if an error occurs
  -     * @exception ConfigurationException if an error occurs
  +     * @throws SAXException if an error occurs
  +     * @throws IOException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       public void serializeToFile( final String filename, final Configuration source )
           throws SAXException, IOException, ConfigurationException
  @@ -232,9 +232,9 @@
        * Serialize the configuration object to a file using a File object.
        * @param file a <code>File</code> value
        * @param source a <code>Configuration</code> value
  -     * @exception SAXException if an error occurs
  -     * @exception IOException if an error occurs
  -     * @exception ConfigurationException if an error occurs
  +     * @throws SAXException if an error occurs
  +     * @throws IOException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       public void serializeToFile( final File file, final Configuration source )
           throws SAXException, IOException, ConfigurationException
  @@ -246,9 +246,9 @@
        * Serialize the configuration object to an output stream.
        * @param outputStream an <code>OutputStream</code> value
        * @param source a <code>Configuration</code> value
  -     * @exception SAXException if an error occurs
  -     * @exception IOException if an error occurs
  -     * @exception ConfigurationException if an error occurs
  +     * @throws SAXException if an error occurs
  +     * @throws IOException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       public void serialize( final OutputStream outputStream, final Configuration source )
           throws SAXException, IOException, ConfigurationException
  @@ -265,9 +265,9 @@
        * URI.  The URI must be resolveable by the <code>java.net.URL</code> object.
        * @param uri a <code>String</code> value
        * @param source a <code>Configuration</code> value
  -     * @exception SAXException if an error occurs
  -     * @exception IOException if an error occurs
  -     * @exception ConfigurationException if an error occurs
  +     * @throws SAXException if an error occurs
  +     * @throws IOException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       public void serialize( final String uri, final Configuration source )
           throws SAXException, IOException, ConfigurationException
  
  
  
  1.5       +10 -10    jakarta-avalon/src/java/org/apache/avalon/framework/configuration/NamespacedSAXConfigurationHandler.java
  
  Index: NamespacedSAXConfigurationHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/configuration/NamespacedSAXConfigurationHandler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- NamespacedSAXConfigurationHandler.java	21 Mar 2002 14:51:13 -0000	1.4
  +++ NamespacedSAXConfigurationHandler.java	10 May 2002 03:00:48 -0000	1.5
  @@ -71,7 +71,7 @@
       /**
        * Handling hook for starting the document parsing.
        *
  -     * @exception SAXException if an error occurs
  +     * @throws SAXException if an error occurs
        */
       public void startDocument()
           throws SAXException
  @@ -83,7 +83,7 @@
       /**
        * Handling hook for ending the document parsing.
        *
  -     * @exception SAXException if an error occurs
  +     * @throws SAXException if an error occurs
        */
       public void endDocument()
           throws SAXException
  @@ -98,7 +98,7 @@
        * @param ch a <code>char[]</code> of data
        * @param start offset in the character array from which to start reading
        * @param end length of character data
  -     * @exception SAXException if an error occurs
  +     * @throws SAXException if an error occurs
        */
       public void characters( final char[] ch, int start, int end )
           throws SAXException
  @@ -130,7 +130,7 @@
        * @param namespaceURI a <code>String</code> value
        * @param localName a <code>String</code> value
        * @param rawName a <code>String</code> value
  -     * @exception SAXException if an error occurs
  +     * @throws SAXException if an error occurs
        */
       public void endElement( final String namespaceURI,
                               final String localName,
  @@ -170,7 +170,7 @@
                                                           final String location )
       {
           String prefix = m_namespaceSupport.getPrefix( namespaceURI );
  -        if (prefix == null) 
  +        if (prefix == null)
           {
               prefix = "";
           }
  @@ -184,7 +184,7 @@
        * @param localName a <code>String</code> value
        * @param rawName a <code>String</code> value
        * @param attributes an <code>Attributes</code> value
  -     * @exception SAXException if an error occurs
  +     * @throws SAXException if an error occurs
        */
       public void startElement( final String namespaceURI,
                                 final String localName,
  @@ -249,7 +249,7 @@
       /**
        * This just throws an exception on a parse error.
        * @param exception the parse error
  -     * @exception SAXException if an error occurs
  +     * @throws SAXException if an error occurs
        */
       public void error( final SAXParseException exception )
           throws SAXException
  @@ -260,7 +260,7 @@
       /**
        * This just throws an exception on a parse error.
        * @param exception the parse error
  -     * @exception SAXException if an error occurs
  +     * @throws SAXException if an error occurs
        */
       public void warning( final SAXParseException exception )
           throws SAXException
  @@ -271,7 +271,7 @@
       /**
        * This just throws an exception on a parse error.
        * @param exception the parse error
  -     * @exception SAXException if an error occurs
  +     * @throws SAXException if an error occurs
        */
       public void fatalError( final SAXParseException exception )
           throws SAXException
  @@ -304,7 +304,7 @@
        *
        * @param prefix a <code>String</code> value
        * @param uri a <code>String</code> value
  -     * @exception SAXException if an error occurs
  +     * @throws SAXException if an error occurs
        */
       public void startPrefixMapping(String prefix, String uri)
           throws SAXException
  
  
  
  1.7       +2 -2      jakarta-avalon/src/java/org/apache/avalon/framework/configuration/Reconfigurable.java
  
  Index: Reconfigurable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/configuration/Reconfigurable.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Reconfigurable.java	21 Mar 2002 14:51:13 -0000	1.6
  +++ Reconfigurable.java	10 May 2002 03:00:48 -0000	1.7
  @@ -23,9 +23,9 @@
        * Describe <code>reconfigure</code> method here.
        *
        * @param configuration a <code>Configuration</code> value
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        */
  -    void reconfigure( Configuration configuration ) 
  +    void reconfigure( Configuration configuration )
           throws ConfigurationException;
   }
   
  
  
  
  1.18      +6 -6      jakarta-avalon/src/java/org/apache/avalon/framework/configuration/SAXConfigurationHandler.java
  
  Index: SAXConfigurationHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/configuration/SAXConfigurationHandler.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- SAXConfigurationHandler.java	6 May 2002 19:23:04 -0000	1.17
  +++ SAXConfigurationHandler.java	10 May 2002 03:00:48 -0000	1.18
  @@ -77,7 +77,7 @@
        * @param ch a <code>char[]</code> of data
        * @param start offset in the character array from which to start reading
        * @param end length of character data
  -     * @exception SAXException if an error occurs
  +     * @throws SAXException if an error occurs
        */
       public void characters( final char[] ch, int start, int end )
           throws SAXException
  @@ -97,7 +97,7 @@
        * @param namespaceURI a <code>String</code> value
        * @param localName a <code>String</code> value
        * @param rawName a <code>String</code> value
  -     * @exception SAXException if an error occurs
  +     * @throws SAXException if an error occurs
        */
       public void endElement( final String namespaceURI,
                               final String localName,
  @@ -162,7 +162,7 @@
        * @param localName a <code>String</code> value
        * @param rawName a <code>String</code> value
        * @param attributes an <code>Attributes</code> value
  -     * @exception SAXException if an error occurs
  +     * @throws SAXException if an error occurs
        */
       public void startElement( final String namespaceURI,
                                 final String localName,
  @@ -219,7 +219,7 @@
       /**
        * This just throws an exception on a parse error.
        * @param exception the parse error
  -     * @exception SAXException if an error occurs
  +     * @throws SAXException if an error occurs
        */
       public void error( final SAXParseException exception )
           throws SAXException
  @@ -230,7 +230,7 @@
       /**
        * This just throws an exception on a parse error.
        * @param exception the parse error
  -     * @exception SAXException if an error occurs
  +     * @throws SAXException if an error occurs
        */
       public void warning( final SAXParseException exception )
           throws SAXException
  @@ -241,7 +241,7 @@
       /**
        * This just throws an exception on a parse error.
        * @param exception the parse error
  -     * @exception SAXException if an error occurs
  +     * @throws SAXException if an error occurs
        */
       public void fatalError( final SAXParseException exception )
           throws SAXException
  
  
  
  1.5       +15 -15    jakarta-avalon/src/java/org/apache/avalon/framework/context/Context.java
  
  Index: Context.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/context/Context.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Context.java	13 Jan 2002 03:47:20 -0000	1.4
  +++ Context.java	10 May 2002 03:00:48 -0000	1.5
  @@ -23,32 +23,32 @@
    * can then be defined there. (examples include MailetContext,
    * BlockContext etc.)</p>
    *
  - * <p>There are traditionally four differet types of Context that may be 
  + * <p>There are traditionally four differet types of Context that may be
    * used in a system. These ideas are partially derived from linguistic theory
    * and partially from tradition computer science;</p>
    *
    * <ol>
  - *   <li>World Context / Per-Application context: This describes application 
  - *   wide settings/context. An example may be the working directory of the 
  + *   <li>World Context / Per-Application context: This describes application
  + *   wide settings/context. An example may be the working directory of the
    *   application.</li>
    *
  - *   <li>Person Context / Per-Component context: This contains context 
  - *   information specific to the component. An example may be the name of 
  + *   <li>Person Context / Per-Component context: This contains context
  + *   information specific to the component. An example may be the name of
    *   the component.</li>
    *
  - *   <li>Conversation Context / Per-Session context: This contains context 
  - *   information specific to the component. An example may be the IP address 
  + *   <li>Conversation Context / Per-Session context: This contains context
  + *   information specific to the component. An example may be the IP address
    *   of the entity who you are talking to.</li>
    *
  - *   <li>Speach Act Context / Per-Request context: This contains information 
  - *   about a specific request in component. Example may include the parameter 
  + *   <li>Speach Act Context / Per-Request context: This contains information
  + *   about a specific request in component. Example may include the parameter
    *   submitted to a particular web form or whatever.</li>
    *
    * </ol>
    *
  - * <p>When we implement this (1) and (2) are generally merged into one interface. 
  - * For instance in the Pheonix Application Server there is a BlockContext. Part 
  - * of the BlockContext consists of two methods. One is getHomeDirectory() and that 
  + * <p>When we implement this (1) and (2) are generally merged into one interface.
  + * For instance in the Pheonix Application Server there is a BlockContext. Part
  + * of the BlockContext consists of two methods. One is getHomeDirectory() and that
    * belongs to (1) while the other is getName() which belongs to (2).</p>
    *
    * <p>(4) is usually passed into a service() style method as parameters. Often it will
  @@ -58,8 +58,8 @@
    * void doMagic( int param1, int param2, Context otherParamsInHere );
    * </pre>
    *
  - * <p>When (3) is needed in the system it is usually also passed into the a serice method 
  - * method, along with the request context (4). Alternatively it is made available via the 
  + * <p>When (3) is needed in the system it is usually also passed into the a serice method
  + * method, along with the request context (4). Alternatively it is made available via the
    * context representing (4).</p>
    *
    * @author <a href="mailto:fede@apache.org">Federico Barbieri</a>
  @@ -74,7 +74,7 @@
        *
        * @param key the key into context
        * @return the object
  -     * @exception ContextException if object not found. Note that this
  +     * @throws ContextException if object not found. Note that this
        *            means that either Component is asking for invalid entry
        *            or the Container is not living up to contract.
        */
  
  
  
  1.4       +3 -3      jakarta-avalon/src/java/org/apache/avalon/framework/context/Contextualizable.java
  
  Index: Contextualizable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/context/Contextualizable.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Contextualizable.java	11 Dec 2001 09:00:45 -0000	1.3
  +++ Contextualizable.java	10 May 2002 03:00:48 -0000	1.4
  @@ -19,12 +19,12 @@
   public interface Contextualizable
   {
       /**
  -     * Pass the Context to the component. 
  -     * This method is called after the Loggable.setLogger() (if present) 
  +     * Pass the Context to the component.
  +     * This method is called after the Loggable.setLogger() (if present)
        * method and before any other method.
        *
        * @param context the context
  -     * @exception ContextException if context is invalid
  +     * @throws ContextException if context is invalid
        */
       void contextualize( Context context )
           throws ContextException;
  
  
  
  1.9       +3 -3      jakarta-avalon/src/java/org/apache/avalon/framework/context/DefaultContext.java
  
  Index: DefaultContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/context/DefaultContext.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DefaultContext.java	11 Dec 2001 09:00:45 -0000	1.8
  +++ DefaultContext.java	10 May 2002 03:00:48 -0000	1.9
  @@ -72,7 +72,7 @@
        *
        * @param key the key of item
        * @return the item stored in context
  -     * @exception ContextException if item not present
  +     * @throws ContextException if item not present
        */
       public Object get( final Object key )
           throws ContextException
  @@ -104,7 +104,7 @@
        *
        * @param key the items key
        * @param value the item
  -     * @exception IllegalStateException if context is read only
  +     * @throws IllegalStateException if context is read only
        */
       public void put( final Object key, final Object value )
           throws IllegalStateException
  @@ -146,7 +146,7 @@
       /**
        * Utility method to check if context is writeable and if not throw exception.
        *
  -     * @exception IllegalStateException if context is read only
  +     * @throws IllegalStateException if context is read only
        */
       protected final void checkWriteable()
           throws IllegalStateException
  
  
  
  1.6       +3 -3      jakarta-avalon/src/java/org/apache/avalon/framework/context/Recontextualizable.java
  
  Index: Recontextualizable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/context/Recontextualizable.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Recontextualizable.java	11 Dec 2001 09:00:45 -0000	1.5
  +++ Recontextualizable.java	10 May 2002 03:00:48 -0000	1.6
  @@ -9,7 +9,7 @@
   
   /**
    * Extends Contextualizable to allow recontextualizing.
  - * This allows a component to re-receive it's context if 
  + * This allows a component to re-receive it's context if
    * container environment has changed.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  @@ -18,12 +18,12 @@
       extends Contextualizable
   {
       /**
  -     * Pass the new Context to the component. 
  +     * Pass the new Context to the component.
        * This method is usually called when component is suspended via use of
        * Suspendable.suspend() method.
        *
        * @param context the context
  -     * @exception ContextException if context is invalid
  +     * @throws ContextException if context is invalid
        */
       void recontextualize( Context context )
           throws ContextException;
  
  
  
  1.6       +1 -1      jakarta-avalon/src/java/org/apache/avalon/framework/context/Resolvable.java
  
  Index: Resolvable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/context/Resolvable.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Resolvable.java	21 Mar 2002 14:51:13 -0000	1.5
  +++ Resolvable.java	10 May 2002 03:00:48 -0000	1.6
  @@ -21,7 +21,7 @@
        *
        * @param context the contextwith respect which to resolve
        * @return the resolved object
  -     * @exception ContextException if an error occurs
  +     * @throws ContextException if an error occurs
        */
       Object resolve( Context context )
           throws ContextException;
  
  
  
  1.6       +1 -1      jakarta-avalon/src/java/org/apache/avalon/framework/parameters/Parameterizable.java
  
  Index: Parameterizable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/parameters/Parameterizable.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Parameterizable.java	28 Feb 2002 13:35:58 -0000	1.5
  +++ Parameterizable.java	10 May 2002 03:00:48 -0000	1.6
  @@ -32,7 +32,7 @@
        * Provide component with parameters.
        *
        * @param parameters the parameters
  -     * @exception ParameterException if parameters are invalid
  +     * @throws ParameterException if parameters are invalid
        */
       void parameterize( Parameters parameters )
           throws ParameterException;
  
  
  
  1.24      +9 -9      jakarta-avalon/src/java/org/apache/avalon/framework/parameters/Parameters.java
  
  Index: Parameters.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/parameters/Parameters.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Parameters.java	25 Apr 2002 01:00:16 -0000	1.23
  +++ Parameters.java	10 May 2002 03:00:48 -0000	1.24
  @@ -72,7 +72,7 @@
        * @param name a <code>String</code> value
        * @param value a <code>String</code> value
        * @return The previous value of the parameter or <b>null</b>.
  -     * @exception IllegalStateException if the Parameters object is read-only
  +     * @throws IllegalStateException if the Parameters object is read-only
        */
       public String setParameter( final String name, final String value )
           throws IllegalStateException
  @@ -268,7 +268,7 @@
           try
           {
               final String value = getParameter( name, null );
  -            if ( value == null ) 
  +            if ( value == null )
   	    {
                   return defaultValue;
               }
  @@ -356,7 +356,7 @@
           try
           {
               final String value = getParameter( name, null );
  -            if( value == null ) 
  +            if( value == null )
   	    {
                   return defaultValue;
               }
  @@ -407,7 +407,7 @@
           try
           {
               final String value = getParameter( name, null );
  -            if( value == null ) 
  +            if( value == null )
   	    {
                   return defaultValue;
               }
  @@ -427,8 +427,8 @@
        *
        * @param name the parameter name
        * @return the value
  -     * @exception ParameterException if an error occurs
  -     * @exception ParameterException
  +     * @throws ParameterException if an error occurs
  +     * @throws ParameterException
        */
       public boolean getParameterAsBoolean( final String name )
           throws ParameterException
  @@ -525,7 +525,7 @@
       /**
        * Checks is this <code>Parameters</code> object is writeable.
        *
  -     * @exception IllegalStateException if this <code>Parameters</code> object is read-only
  +     * @throws IllegalStateException if this <code>Parameters</code> object is read-only
        */
       protected final void checkWriteable()
           throws IllegalStateException
  @@ -545,7 +545,7 @@
        *
        * @param configuration the Configuration
        * @return This <code>Parameters</code> instance.
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       public static Parameters fromConfiguration( final Configuration configuration )
           throws ConfigurationException
  @@ -560,7 +560,7 @@
        * @param configuration the Configuration
        * @param elementName   the element name for the parameters
        * @return This <code>Parameters</code> instance.
  -     * @exception ConfigurationException if an error occurs
  +     * @throws ConfigurationException if an error occurs
        */
       public static Parameters fromConfiguration( final Configuration configuration,
                                                   final String elementName )
  
  
  
  1.3       +1 -1      jakarta-avalon/src/java/org/apache/avalon/framework/parameters/Reparameterizable.java
  
  Index: Reparameterizable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/parameters/Reparameterizable.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Reparameterizable.java	11 Dec 2001 09:00:47 -0000	1.2
  +++ Reparameterizable.java	10 May 2002 03:00:48 -0000	1.3
  @@ -22,7 +22,7 @@
        * Provide component with parameters.
        *
        * @param parameters the parameters
  -     * @exception ParameterException if parameters are invalid
  +     * @throws ParameterException if parameters are invalid
        */
       void reparameterize( Parameters parameters )
           throws ParameterException;
  
  
  
  1.4       +3 -3      jakarta-avalon/src/java/org/apache/avalon/framework/service/DefaultServiceManager.java
  
  Index: DefaultServiceManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/service/DefaultServiceManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultServiceManager.java	21 Mar 2002 14:51:13 -0000	1.3
  +++ DefaultServiceManager.java	10 May 2002 03:00:48 -0000	1.4
  @@ -52,7 +52,7 @@
        *
        * @param role the role
        * @return the Object
  -     * @exception ServiceException if an error occurs
  +     * @throws ServiceException if an error occurs
        */
       public Object lookup( final String role )
           throws ServiceException
  @@ -79,7 +79,7 @@
        * @param role  a string identifying the role to check.
        * @return True if the object exists, False if it does not.
        */
  -    public boolean hasService( final String role ) 
  +    public boolean hasService( final String role )
       {
           boolean objectExists = false;
   
  @@ -160,7 +160,7 @@
       /**
        * Checks if this service manager is writeable.
        *
  -     * @exception IllegalStateException if this service manager is read-only
  +     * @throws IllegalStateException if this service manager is read-only
        */
       protected final void checkWriteable()
           throws IllegalStateException
  
  
  
  1.3       +3 -3      jakarta-avalon/src/java/org/apache/avalon/framework/service/DefaultServiceSelector.java
  
  Index: DefaultServiceSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/service/DefaultServiceSelector.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultServiceSelector.java	21 Mar 2002 14:51:13 -0000	1.2
  +++ DefaultServiceSelector.java	10 May 2002 03:00:48 -0000	1.3
  @@ -28,7 +28,7 @@
        *
        * @param hint the hint to retrieve Object
        * @return the Object
  -     * @exception ServiceException if an error occurs
  +     * @throws ServiceException if an error occurs
        */
       public Object select( Object hint )
           throws ServiceException
  @@ -51,7 +51,7 @@
        * @param hint the hint to retrieve Object
        * @return <code>true</code> if the Object exists
        */
  -    public boolean isSelectable( final Object hint ) 
  +    public boolean isSelectable( final Object hint )
       {
           boolean objectExists = false;
   
  @@ -112,7 +112,7 @@
       /**
        * Checks if this service selector is writeable.
        *
  -     * @exception IllegalStateException if this service selector is read-only
  +     * @throws IllegalStateException if this service selector is read-only
        */
       protected final void checkWriteable()
           throws IllegalStateException
  
  
  
  1.3       +2 -2      jakarta-avalon/src/java/org/apache/avalon/framework/service/ServiceManager.java
  
  Index: ServiceManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/service/ServiceManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ServiceManager.java	21 Mar 2002 14:51:13 -0000	1.2
  +++ ServiceManager.java	10 May 2002 03:00:48 -0000	1.3
  @@ -63,7 +63,7 @@
        *
        * @param role The role name of the <code>Object</code> to retrieve.
        * @return an <code>Object</code> value
  -     * @exception ServiceException if an error occurs
  +     * @throws ServiceException if an error occurs
        */
       Object lookup( String role )
           throws ServiceException;
  @@ -79,7 +79,7 @@
       /**
        * Return the <code>Object</code> when you are finished with it.  This
        * allows the <code>ServiceManager</code> to handle the End-Of-Life Lifecycle
  -     * events associated with the <code>Object</code>.  Please note, that no 
  +     * events associated with the <code>Object</code>.  Please note, that no
        * Exception should be thrown at this point.  This is to allow easy use of the
        * ServiceManager system without having to trap Exceptions on a release.
        *
  
  
  
  1.3       +2 -2      jakarta-avalon/src/java/org/apache/avalon/framework/service/ServiceSelector.java
  
  Index: ServiceSelector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/service/ServiceSelector.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ServiceSelector.java	21 Mar 2002 14:51:13 -0000	1.2
  +++ ServiceSelector.java	10 May 2002 03:00:48 -0000	1.3
  @@ -42,7 +42,7 @@
        * @param policy A criteria against which a <code>Object</code> is selected.
        *
        * @return an <code>Object</code> value
  -     * @exception ServiceException If the requested <code>Object</code> cannot be supplied
  +     * @throws ServiceException If the requested <code>Object</code> cannot be supplied
        */
       Object select( Object policy )
           throws ServiceException;
  @@ -58,7 +58,7 @@
       /**
        * Return the <code>Object</code> when you are finished with it.  This
        * allows the <code>ServiceSelector</code> to handle the End-Of-Life Lifecycle
  -     * events associated with the <code>Object</code>.  Please note, that no 
  +     * events associated with the <code>Object</code>.  Please note, that no
        * Exception should be thrown at this point.  This is to allow easy use of the
        * ServiceSelector system without having to trap Exceptions on a release.
        *
  
  
  
  1.5       +3 -3      jakarta-avalon/src/java/org/apache/avalon/framework/service/Serviceable.java
  
  Index: Serviceable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/framework/service/Serviceable.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Serviceable.java	21 Mar 2002 14:51:13 -0000	1.4
  +++ Serviceable.java	10 May 2002 03:00:48 -0000	1.5
  @@ -17,8 +17,8 @@
    * The <code>Serviceable</code> is able to use <code>Object</code>s managed
    * by the <code>ServiceManager</code> it was initialized with.  As part
    * of the contract with the system, the instantiating entity must call
  - * the <code>compose</code> method before the <code>Serviceable</code> 
  - * can be considered valid. 
  + * the <code>compose</code> method before the <code>Serviceable</code>
  + * can be considered valid.
    *
    * @author <a href="mailto:fede@apache.org">Federico Barbieri</a>
    * @author <a href="mailto:pier@apache.org">Pierpaolo Fumagalli</a>
  @@ -39,7 +39,7 @@
        *
        * @param manager The <code>ServiceManager</code> which this
        *                <code>Serviceable</code> uses.
  -     * @exception ServiceException if an error occurs
  +     * @throws ServiceException if an error occurs
        */
       void service( ServiceManager manager )
           throws ServiceException;
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message