cvs commit: spice/sandbox/metaclass/src/test/org/realityforge/metaclass/tools/tasks MetaGenerateTaskTestCase.java

pdonald     2003/11/20 03:23:19

  Modified:    sandbox/metaclass/src/java/org/realityforge/metaclass/tools/tasks
                        GenerateClassDescriptorsTask.java
               sandbox/metaclass/src/test/org/realityforge/metaclass/tools/tasks
                        MetaGenerateTaskTestCase.java
  Log:
  Integrate Interceptor and FIlter sets into task
  
  Revision  Changes    Path
  1.16      +40 -16    spice/sandbox/metaclass/src/java/org/realityforge/metaclass/tools/tasks/GenerateClassDescriptorsTask.java
  
  Index: GenerateClassDescriptorsTask.java
  ===================================================================
  RCS file: /scm/cvs/spice/sandbox/metaclass/src/java/org/realityforge/metaclass/tools/tasks/GenerateClassDescriptorsTask.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- GenerateClassDescriptorsTask.java	18 Nov 2003 23:06:22 -0000	1.15
  +++ GenerateClassDescriptorsTask.java	20 Nov 2003 09:23:19 -0000	1.16
  @@ -34,7 +34,7 @@
    * A Task to generate Attributes descriptors from source files.
    *
    * @author <a href="mailto:peter at realityforge.org">Peter Donald</a>
  - * @version $Revision: 1.15 $ $Date: 2003/11/18 23:06:22 $
  + * @version $Revision: 1.16 $ $Date: 2003/11/20 09:23:19 $
    */
   public class GenerateClassDescriptorsTask
       extends Task
  @@ -85,12 +85,12 @@
       /**
        * Internal list of filter elements added by user.
        */
  -    private final List m_filters = new ArrayList();
  +    private final FilterSet m_filterSet = new FilterSet();
   
       /**
        * Internal list of interceptor elements added by user.
        */
  -    private final List m_elements = new ArrayList();
  +    private final InterceptorSet m_interceptorSet = new InterceptorSet();
   
       /**
        * Flag set to true if writing a descriptor fails.
  @@ -108,17 +108,35 @@
       private final List m_filesets = new ArrayList();
   
       /**
  -     * Add an filter definition that will create filter to process metadata.
  +     * Setup project for task.
  +     *
  +     * @param project the project
  +     */
  +    public void setProject( final Project project )
  +    {
  +        super.setProject( project );
  +        m_filterSet.setProject( project );
  +        m_interceptorSet.setProject( project );
  +    }
  +
  +    /**
  +     * Add a filter definition that will create filter to process metadata.
        *
        * @param element the filter definition
        */
       public void addFilter( final PluginElement element )
       {
  -        if( null == element.getName() )
  -        {
  -            throw new BuildException( "Filter must have a name" );
  -        }
  -        m_filters.add( element );
  +        m_filterSet.addFilter( element );
  +    }
  +
  +    /**
  +     * Add a filter definition set.
  +     *
  +     * @param set a filter definition set.
  +     */
  +    public void addFilterSet( final FilterSet set )
  +    {
  +        m_filterSet.addFilterSet( set );
       }
   
       /**
  @@ -128,11 +146,17 @@
        */
       public void addInterceptor( final PluginElement element )
       {
  -        if( null == element.getName() )
  -        {
  -            throw new BuildException( "Interceptor must have a name" );
  -        }
  -        m_elements.add( element );
  +        m_interceptorSet.addInterceptor( element );
  +    }
  +
  +    /**
  +     * Add an interceptor definition set.
  +     *
  +     * @param set the interceptor set
  +     */
  +    public void addInterceptorSet( final InterceptorSet set )
  +    {
  +        m_interceptorSet.addInterceptorSet( set );
       }
   
       /**
  @@ -276,7 +300,7 @@
        */
       private void setupFilters()
       {
  -        final Iterator iterator = m_filters.iterator();
  +        final Iterator iterator = m_filterSet.toPlugins().iterator();
           while( iterator.hasNext() )
           {
               final PluginElement element = (PluginElement)iterator.next();
  @@ -293,7 +317,7 @@
        */
       private void setupInterceptors()
       {
  -        final Iterator iterator = m_elements.iterator();
  +        final Iterator iterator = m_interceptorSet.toPlugins().iterator();
           while( iterator.hasNext() )
           {
               final PluginElement element = (PluginElement)iterator.next();
  
  
  
  1.25      +3 -1      spice/sandbox/metaclass/src/test/org/realityforge/metaclass/tools/tasks/MetaGenerateTaskTestCase.java
  
  Index: MetaGenerateTaskTestCase.java
  ===================================================================
  RCS file: /scm/cvs/spice/sandbox/metaclass/src/test/org/realityforge/metaclass/tools/tasks/MetaGenerateTaskTestCase.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- MetaGenerateTaskTestCase.java	18 Nov 2003 23:06:22 -0000	1.24
  +++ MetaGenerateTaskTestCase.java	20 Nov 2003 09:23:19 -0000	1.25
  @@ -30,7 +30,7 @@
   /**
    *
    * @author <a href="mailto:peter at realityforge.org">Peter Donald</a>
  - * @version $Revision: 1.24 $ $Date: 2003/11/18 23:06:22 $
  + * @version $Revision: 1.25 $ $Date: 2003/11/20 09:23:19 $
    */
   public class MetaGenerateTaskTestCase
       extends TestCase
  @@ -618,6 +618,7 @@
           task.addFileset( fileSet );
           task.setNamespaceTagsOnly( false );
           task.addInterceptor( element );
  +        task.addInterceptorSet( new InterceptorSet() );
           task.execute();
           final String destFilename =
               destDirectory + File.separator + "com" + File.separator + "biz" + File.separator + "MyClass" + DefaultMetaClassAccessor.BINARY_EXT;
  @@ -673,6 +674,7 @@
           final PluginElement element = new PluginElement();
           element.setName( PassThroughFilter.class.getName() );
           task.addFilter( element );
  +        task.addFilterSet( new FilterSet() );
           task.setNamespaceTagsOnly( false );
           task.execute();
           final String destFilename =