Update of /cvsroot/xdoclet/xjavadoc/javacc
In directory sc8-pr-cvs1:/tmp/cvs-serv14311/xjavadoc/javacc
Modified Files:
Java1.2-b.jjt
Log Message:
Fixed UnmodifiedInterfaceDeclaration bug (XJD-17) and added a test case for it.
Index: Java1.2-b.jjt
===================================================================
RCS file: /cvsroot/xdoclet/xjavadoc/javacc/Java1.2-b.jjt,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** Java1.2-b.jjt 20 Mar 2003 22:36:07 -0000 1.40
--- Java1.2-b.jjt 21 Mar 2003 15:36:10 -0000 1.41
***************
*** 54,58 ****
{
private String _packageName = "";
! private SourceClass _outerClass;
private Stack _sourceClassStack = new Stack();
--- 54,59 ----
{
private String _packageName = "";
! // The class we're currently parsing
! private SourceClass _sourceClass;
private Stack _sourceClassStack = new Stack();
***************
*** 98,105 ****
if( !_hasParsedMain ) {
// the usual case
! clazz = _outerClass;
} else {
// the source contains more than one classes
! clazz = new SourceClass(_outerClass, 0);
}
} else {
--- 99,106 ----
if( !_hasParsedMain ) {
// the usual case
! clazz = _sourceClass;
} else {
// the source contains more than one classes
! clazz = new SourceClass(_sourceClass, 0);
}
} else {
***************
*** 150,154 ****
throws ParseException
{
! _outerClass = sourceClass;
// Reset state
--- 151,155 ----
throws ParseException
{
! _sourceClass = sourceClass;
// Reset state
***************
*** 476,480 ****
"package" _packageName=Name() ";"
{
! _outerClass.setContainingPackage( _packageName );
}
}
--- 477,481 ----
"package" _packageName=Name() ";"
{
! _sourceClass.setContainingPackage( _packageName );
}
}
***************
*** 494,500 ****
{
if( isPackage ) {
! _outerClass.addImportedPackage(importedElement);
} else {
! _outerClass.addImportedClass(importedElement);
}
}
--- 495,501 ----
{
if( isPackage ) {
! _sourceClass.addImportedPackage(importedElement);
} else {
! _sourceClass.addImportedClass(importedElement);
}
}
***************
*** 580,585 ****
} else {
sourceClass.setQualifiedName(Util.getQualifiedNameFor(_packageName,name.image));
! XJavaDoc.getInstance().addPackageMaybe( _packageName ).addClass(_outerClass);
! XJavaDoc.getInstance().addSourceClass( _outerClass );
sourceClass.resolveImportedClasses();
--- 581,586 ----
} else {
sourceClass.setQualifiedName(Util.getQualifiedNameFor(_packageName,name.image));
! XJavaDoc.getInstance().addPackageMaybe( _packageName ).addClass(sourceClass);
! XJavaDoc.getInstance().addSourceClass( sourceClass );
sourceClass.resolveImportedClasses();
***************
*** 769,776 ****
XJavaDoc.getInstance().addSourceClass( sourceClass );
} else {
!
_outerClass.setQualifiedName(Util.getQualifiedNameFor(_packageName,name.image));
! XJavaDoc.getInstance().addPackageMaybe( _packageName ).addClass(_outerClass);
! XJavaDoc.getInstance().addSourceClass( _outerClass );
! _outerClass.resolveImportedClasses();
}
--- 770,777 ----
XJavaDoc.getInstance().addSourceClass( sourceClass );
} else {
!
sourceClass.setQualifiedName(Util.getQualifiedNameFor(_packageName,name.image));
! XJavaDoc.getInstance().addPackageMaybe( _packageName ).addClass(sourceClass);
! XJavaDoc.getInstance().addSourceClass( sourceClass );
! sourceClass.resolveImportedClasses();
}
-------------------------------------------------------
This SF.net email is sponsored by:Crypto Challenge is now open!
Get cracking and register here for some mind boggling fun and
the chance of winning an Apple iPod:
http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0031en
_______________________________________________
xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
