[Xdoclet-devel] CVS update: xjavadoc/javacc Java1.2-b.jjt

[Aslak Helles?y]

  User: rinkrank
  Date: 02/10/18 07:50:17

  Modified:    javacc   Tag: XDOCLET_2_0 Java1.2-b.jjt
  Log:
  Simplified XJavadoc API
  -passing qualifiedName to SourceClass no longer needed, it's discovered during parse 
(it wasn't before)
  -deprecated all methods that pass qualifiedName
  -deprecated methods that pass useNodeParser. This must be set prior to parsing with 
XJavaDoc.setUseNodeParser(boolean)
  -Simplified CodeTestCase API, only takes File as argument
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.32.2.2  +23 -7     xjavadoc/javacc/Java1.2-b.jjt
  
  Index: Java1.2-b.jjt
  ===================================================================
  RCS file: /cvsroot/xdoclet/xjavadoc/javacc/Java1.2-b.jjt,v
  retrieving revision 1.32.2.1
  retrieving revision 1.32.2.2
  diff -u -w -r1.32.2.1 -r1.32.2.2
  --- Java1.2-b.jjt     16 Oct 2002 23:06:30 -0000      1.32.2.1
  +++ Java1.2-b.jjt     18 Oct 2002 14:50:17 -0000      1.32.2.2
  @@ -60,6 +60,7 @@
   
   public class @parser-class@ implements JavaParser
   {
  +   private String _packageName = "";
      private SourceClass _outerClass;
      private Stack sourceClassStack = new Stack();
   
  @@ -420,12 +421,11 @@
   
   void PackageDeclaration() :
   {
  -   String packageName;
   }
   {
  -  "package" packageName=Name() ";"
  +  "package" _packageName=Name() ";"
     {
  -     _outerClass.setContainingPackage( packageName );
  +     _outerClass.setContainingPackage( _packageName );
     }
   }
   
  @@ -521,6 +521,13 @@
      {
       if(sourceClass.isInner()) {
           sourceClass.setName(name.image);
  +        XJavaDoc.getInstance().addPackageMaybe( _packageName 
).addClass(sourceClass);
  +        XJavaDoc.getInstance().addSourceClass( sourceClass );
  +    } else {
  +        
_outerClass.setQualifiedName(Util.getQualifiedNameFor(_packageName,name.image));
  +        XJavaDoc.getInstance().addPackageMaybe( _packageName 
).addClass(_outerClass);
  +        XJavaDoc.getInstance().addSourceClass( _outerClass );
  +        _outerClass.resolveImportedClasses();
       }
      }
      [ "extends" superclass=Name() ]
  @@ -699,9 +706,18 @@
     {
         // interfaces are always abstract
         sourceClass.addModifier( Modifier.ABSTRACT );
  +
         if( sourceClass.isInner() ) {
            sourceClass.setName( name.image );
  +        XJavaDoc.getInstance().addPackageMaybe( _packageName 
).addClass(sourceClass);
  +        XJavaDoc.getInstance().addSourceClass( sourceClass );
  +      } else {
  +        
_outerClass.setQualifiedName(Util.getQualifiedNameFor(_packageName,name.image));
  +        XJavaDoc.getInstance().addPackageMaybe( _packageName 
).addClass(_outerClass);
  +        XJavaDoc.getInstance().addSourceClass( _outerClass );
  +        _outerClass.resolveImportedClasses();
         }
  +
         sourceClass.setInterface( true );
         setToken(sourceClass,it);
   
  @@ -944,7 +960,7 @@
        }
     }
     FormalParameters(methodImpl) ( "[" "]" {
  -     methodImpl.setReturnDimension( methodImpl.getReturnDimension() + 1 );
  +     methodImpl.setReturnDimension( methodImpl.getDimension() + 1 );
     }
     )*
   }
  @@ -1076,7 +1092,7 @@
     )
     ( "[" "]" {
        if( methodImpl != null ) {
  -        methodImpl.setReturnDimension(methodImpl.getReturnDimension() + 1);
  +        methodImpl.setReturnDimension(methodImpl.getDimension() + 1);
        }
     } )*
   }
  
  
  


-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel