You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by hu...@apache.org on 2002/08/07 09:05:31 UTC

cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet MxInfoSubTask.java

huw         2002/08/07 00:05:31

  Modified:    src/java/org/apache/avalon/phoenix/tools/xdoclet
                        MxInfoSubTask.java
  Log:
  Fixed bug where proxy class wouldn't be included unless target class was also manageable.
  
  Revision  Changes    Path
  1.2       +4 -9      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/MxInfoSubTask.java
  
  Index: MxInfoSubTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/MxInfoSubTask.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MxInfoSubTask.java	30 Jul 2002 12:17:21 -0000	1.1
  +++ MxInfoSubTask.java	7 Aug 2002 07:05:30 -0000	1.2
  @@ -37,7 +37,6 @@
           final URL resource = getClass().getResource( DEFAULT_TEMPLATE_FILE );
           setTemplateURL( resource );
           setDestinationFile( GENERATED_FILE_NAME );
  -        setHavingClassTag( "phoenix:mx-topic" );
   
           final TemplateSubTask.ExtentTypes extent = new TemplateSubTask.ExtentTypes();
           extent.setValue( "hierarchy" );
  @@ -100,13 +99,9 @@
       protected boolean matchesGenerationRules( final XClass clazz )
           throws XDocletException
       {
  -        if( !super.matchesGenerationRules( clazz ) )
  -        {
  -            return false;
  -        }
  -        else
  -        {
  -            return true;
  -        }
  +        // need to do this here instead of setting setHavingClassTag() because want to match on either
  +        // phoenix:mx-topic or phoenix:mx-proxy.
  +        return super.matchesGenerationRules( clazz ) &&
  +                ( clazz.doc().hasTag("phoenix:mx-topic", false) || clazz.doc().hasTag("phoenix:mx-proxy", false) );
       }
   }
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>