ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/runtime Facility.java
Date Tue, 12 Mar 2002 10:33:55 GMT
donaldp     02/03/12 02:33:54

  Modified:    proposal/myrmidon/src/java/org/apache/myrmidon/framework
                        AbstractContainerTask.java TypeInstanceTask.java
               proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer
                        ClassicConfigurer.java DefaultConfigurer.java
               proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/configurer
                        Configurer.java
               proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer
                        DefaultConfigurerTest.java
               proposal/myrmidon/src/java/org/apache/myrmidon/components/executor
                        DefaultExecutor.java
               proposal/myrmidon/src/java/org/apache/antlib/runtime
                        Facility.java
  Log:
  Configurer.configure -->
     Configurer.configureElement + Configurer.configureAttribute
  
  Revision  Changes    Path
  1.20      +5 -5      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java
  
  Index: AbstractContainerTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- AbstractContainerTask.java	3 Mar 2002 06:41:26 -0000	1.19
  +++ AbstractContainerTask.java	12 Mar 2002 10:33:54 -0000	1.20
  @@ -27,7 +27,7 @@
    * This is the class that Task writers should extend to provide custom tasks.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.19 $ $Date: 2002/03/03 06:41:26 $
  + * @version $Revision: 1.20 $ $Date: 2002/03/12 10:33:54 $
    */
   public abstract class AbstractContainerTask
       extends AbstractTask
  @@ -89,10 +89,10 @@
        * @param element the configuration element
        * @exception ConfigurationException if an error occurs
        */
  -    protected final void configure( final Object object, final Configuration element )
  +    protected final void configureElement( final Object object, final Configuration element
)
           throws ConfigurationException
       {
  -        m_configurer.configure( object, element, getContext() );
  +        m_configurer.configureElement( object, element, getContext() );
       }
   
       /**
  @@ -103,10 +103,10 @@
        * @param value the attibute value
        * @exception ConfigurationException if an error occurs
        */
  -    protected final void configure( final Object object, final String name, final String
value )
  +    protected final void configureAttribute( final Object object, final String name, final
String value )
           throws ConfigurationException
       {
  -        m_configurer.configure( object, name, value, getContext() );
  +        m_configurer.configureAttribute( object, name, value, getContext() );
       }
   
       /**
  
  
  
  1.14      +3 -3      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/TypeInstanceTask.java
  
  Index: TypeInstanceTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/TypeInstanceTask.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- TypeInstanceTask.java	1 Mar 2002 10:33:38 -0000	1.13
  +++ TypeInstanceTask.java	12 Mar 2002 10:33:54 -0000	1.14
  @@ -19,7 +19,7 @@
    * This is the property "task" to declare a binding of a datatype to a name.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.13 $ $Date: 2002/03/01 10:33:38 $
  + * @version $Revision: 1.14 $ $Date: 2002/03/12 10:33:54 $
    */
   public class TypeInstanceTask
       extends AbstractContainerTask
  @@ -45,7 +45,7 @@
   
               if( name.equals( "id" ) || name.equals( "local-scope" ) )
               {
  -                configure( this, name, value );
  +                configureAttribute( this, name, value );
               }
               else
               {
  @@ -69,7 +69,7 @@
               throw new ConfigurationException( message, e );
           }
   
  -        configure( m_value, newConfiguration );
  +        configureElement( m_value, newConfiguration );
       }
   
       public void setId( final String id )
  
  
  
  1.9       +4 -4      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/ClassicConfigurer.java
  
  Index: ClassicConfigurer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/ClassicConfigurer.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ClassicConfigurer.java	3 Mar 2002 07:30:38 -0000	1.8
  +++ ClassicConfigurer.java	12 Mar 2002 10:33:54 -0000	1.9
  @@ -64,7 +64,7 @@
        * @param context the Context
        * @exception ConfigurationException if an error occurs
        */
  -    public void configure( final Object object,
  +    public void configureElement( final Object object,
                              final Configuration configuration,
                              final TaskContext context )
           throws ConfigurationException
  @@ -154,7 +154,7 @@
        * @param context the Context
        * @exception ConfigurationException if an error occurs
        */
  -    public void configure( final Object object,
  +    public void configureAttribute( final Object object,
                              final String name,
                              final String value,
                              final TaskContext context )
  @@ -474,7 +474,7 @@
           try
           {
               final Object created = method.invoke( object, new Object[ 0 ] );
  -            configure( created, configuration, context );
  +            configureElement( created, configuration, context );
           }
           catch( final ConfigurationException ce )
           {
  @@ -498,7 +498,7 @@
               final Class clazz = method.getParameterTypes()[ 0 ];
               final Object created = clazz.newInstance();
   
  -            configure( created, configuration, context );
  +            configureElement( created, configuration, context );
               method.invoke( object, new Object[]{created} );
           }
           catch( final ConfigurationException ce )
  
  
  
  1.39      +3 -3      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java
  
  Index: DefaultConfigurer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- DefaultConfigurer.java	5 Mar 2002 14:46:05 -0000	1.38
  +++ DefaultConfigurer.java	12 Mar 2002 10:33:54 -0000	1.39
  @@ -33,7 +33,7 @@
    * Class used to configure tasks.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.38 $ $Date: 2002/03/05 14:46:05 $
  + * @version $Revision: 1.39 $ $Date: 2002/03/12 10:33:54 $
    * @ant:type type="configurer" name="default"
    */
   public class DefaultConfigurer
  @@ -77,7 +77,7 @@
        * @param context the Context
        * @exception ConfigurationException if an error occurs
        */
  -    public void configure( final Object object,
  +    public void configureElement( final Object object,
                              final Configuration configuration,
                              final TaskContext context )
           throws ConfigurationException
  @@ -217,7 +217,7 @@
        * @param context the Context
        * @exception ConfigurationException if an error occurs
        */
  -    public void configure( final Object object,
  +    public void configureAttribute( final Object object,
                              final String name,
                              final String value,
                              final TaskContext context )
  
  
  
  1.10      +3 -3      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/configurer/Configurer.java
  
  Index: Configurer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/configurer/Configurer.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Configurer.java	3 Mar 2002 07:30:38 -0000	1.9
  +++ Configurer.java	12 Mar 2002 10:33:54 -0000	1.10
  @@ -15,7 +15,7 @@
    * Class used to configure tasks.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.9 $ $Date: 2002/03/03 07:30:38 $
  + * @version $Revision: 1.10 $ $Date: 2002/03/12 10:33:54 $
    * @ant:role shorthand="configurer"
    */
   public interface Configurer
  @@ -32,7 +32,7 @@
        * @param context the Context
        * @exception ConfigurationException if an error occurs
        */
  -    void configure( Object object, Configuration configuration, TaskContext context )
  +    void configureElement( Object object, Configuration configuration, TaskContext context
)
           throws ConfigurationException;
   
       /**
  @@ -46,6 +46,6 @@
        * @param context the Context
        * @exception ConfigurationException if an error occurs
        */
  -    void configure( Object object, String name, String value, TaskContext context )
  +    void configureAttribute( Object object, String name, String value, TaskContext context
)
           throws ConfigurationException;
   }
  
  
  
  1.21      +12 -12    jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java
  
  Index: DefaultConfigurerTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- DefaultConfigurerTest.java	6 Mar 2002 10:09:45 -0000	1.20
  +++ DefaultConfigurerTest.java	12 Mar 2002 10:33:54 -0000	1.21
  @@ -146,7 +146,7 @@
           // Configure the object
           try
           {
  -            m_configurer.configure( test, config, m_context );
  +            m_configurer.configureElement( test, config, m_context );
               fail();
           }
           catch( final ConfigurationException ce )
  @@ -205,7 +205,7 @@
           // Configure the object
           try
           {
  -            m_configurer.configure( test, config, m_context );
  +            m_configurer.configureElement( test, config, m_context );
               fail();
           }
           catch( final ConfigurationException ce )
  @@ -252,7 +252,7 @@
           // Configure the object
           try
           {
  -            m_configurer.configure( test, config, m_context );
  +            m_configurer.configureElement( test, config, m_context );
               fail();
           }
           catch( final ConfigurationException ce )
  @@ -323,7 +323,7 @@
           m_context.setProperty( "prop-a", "some value" );
   
           // Configure the object
  -        m_configurer.configure( test, config, m_context );
  +        m_configurer.configureElement( test, config, m_context );
   
           // Check the configured object
           final ConfigTestReferenceElement expected = new ConfigTestReferenceElement();
  @@ -349,7 +349,7 @@
           try
           {
               // Configure the object
  -            m_configurer.configure( test, config, m_context );
  +            m_configurer.configureElement( test, config, m_context );
               fail();
           }
           catch( ConfigurationException e )
  @@ -429,7 +429,7 @@
           try
           {
               // Configure the object
  -            m_configurer.configure( test, config, m_context );
  +            m_configurer.configureElement( test, config, m_context );
               fail();
           }
           catch( final ConfigurationException ce )
  @@ -458,7 +458,7 @@
           try
           {
               // Configure the object
  -            m_configurer.configure( test, config, m_context );
  +            m_configurer.configureElement( test, config, m_context );
               fail();
           }
           catch( final ConfigurationException ce )
  @@ -616,7 +616,7 @@
           final ConfigTestConfigurable test = new ConfigTestConfigurable();
   
           // Configure the object
  -        m_configurer.configure( test, config, m_context );
  +        m_configurer.configureElement( test, config, m_context );
   
           final ConfigTestConfigurable expected = new ConfigTestConfigurable();
           expected.configure( config );
  @@ -662,7 +662,7 @@
           // Configure the object
           try
           {
  -            m_configurer.configure( test, config, m_context );
  +            m_configurer.configureElement( test, config, m_context );
               fail();
           }
           catch( ConfigurationException e )
  @@ -693,7 +693,7 @@
           // Configure the object
           try
           {
  -            m_configurer.configure( test, config, m_context );
  +            m_configurer.configureElement( test, config, m_context );
               fail();
           }
           catch( ConfigurationException e )
  @@ -753,7 +753,7 @@
           try
           {
               // Configure the object
  -            m_configurer.configure( test, config, m_context );
  +            m_configurer.configureElement( test, config, m_context );
               fail();
           }
           catch( ConfigurationException e )
  @@ -797,7 +797,7 @@
       {
           try
           {
  -            m_configurer.configure( test, config, m_context );
  +            m_configurer.configureElement( test, config, m_context );
           }
           catch( final ConfigurationException ce )
           {
  
  
  
  1.31      +2 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java
  
  Index: DefaultExecutor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- DefaultExecutor.java	11 Mar 2002 08:41:32 -0000	1.30
  +++ DefaultExecutor.java	12 Mar 2002 10:33:54 -0000	1.31
  @@ -28,7 +28,7 @@
    * The basic executor that just executes the tasks.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.30 $ $Date: 2002/03/11 08:41:32 $
  + * @version $Revision: 1.31 $ $Date: 2002/03/12 10:33:54 $
    */
   public class DefaultExecutor
       extends AbstractLogEnabled
  @@ -115,7 +115,7 @@
                                         final TaskContext taskContext )
           throws ConfigurationException
       {
  -        m_configurer.configure( task, taskModel, taskContext );
  +        m_configurer.configureElement( task, taskModel, taskContext );
       }
   
       /**
  
  
  
  1.10      +2 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/runtime/Facility.java
  
  Index: Facility.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/runtime/Facility.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Facility.java	14 Feb 2002 10:53:53 -0000	1.9
  +++ Facility.java	12 Mar 2002 10:33:54 -0000	1.10
  @@ -41,7 +41,7 @@
           {
               final String name = attributes[ i ];
               final String value = configuration.getAttribute( name );
  -            configure( this, name, value );
  +            configureAttribute( this, name, value );
           }
   
           final Configuration[] children = configuration.getChildren();
  @@ -60,7 +60,7 @@
                   throw new ConfigurationException( message, e );
               }
   
  -            configure( m_aspectHandler, children[ 0 ] );
  +            configureElement( m_aspectHandler, children[ 0 ] );
           }
           else
           {
  
  
  

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


Mime
View raw message