--- a/JavaClassReader.st Thu Nov 12 20:32:20 1998 +0000
+++ b/JavaClassReader.st Thu Nov 12 20:33:33 1998 +0000
@@ -691,7 +691,9 @@
existingSuperClass := JavaVM classForJavaClassObject:jSuperClass.
].
existingSuperClass isNil ifTrue:[
- self halt:('cannot find superclass: ' , superClassName).
+ ('JAVA: cannot find superclass: ' , superClassName) infoPrintCR.
+ "/ self halt:('cannot find superclass: ' , superClassName).
+ ^ nil.
].
super_class := existingSuperClass
] ifFalse:[
@@ -780,7 +782,7 @@
"
"Created: / 15.4.1996 / 15:02:47 / cg"
- "Modified: / 13.5.1998 / 14:35:20 / cg"
+ "Modified: / 12.11.1998 / 21:14:45 / cg"
!
readStream:aStream ignoring:classesBeingLoaded
@@ -2105,6 +2107,6 @@
!JavaClassReader class methodsFor:'documentation'!
version
- ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaClassReader.st,v 1.77 1998/11/11 15:02:49 cg Exp $'
+ ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaClassReader.st,v 1.78 1998/11/12 20:33:17 cg Exp $'
! !
JavaClassReader initialize!
--- a/JavaDecompiler.st Thu Nov 12 20:32:20 1998 +0000
+++ b/JavaDecompiler.st Thu Nov 12 20:33:33 1998 +0000
@@ -384,16 +384,24 @@
s nextPutAll:'implements '.
].
interfaces keysAndValuesDo:[:nr :if |
+ |nameString|
+
nr ~~ 1 ifTrue:[
s nextPutAll:', '.
].
s emphasis:classNameStyle.
(if package ~= 'java/lang'
and:[if package ~= pckgName]) ifTrue:[
- s nextPutAll:(if displayString)
+ if isJavaClass ifFalse:[
+ "/ ought to be an unresolved class ...
+ nameString := if fullName copyReplaceAll:$/ with:$.
+ ] ifTrue:[
+ nameString := if displayString
+ ].
] ifFalse:[
- s nextPutAll:(if lastName)
+ nameString := if lastName
].
+ s nextPutAll:nameString.
s emphasis:codeStyle.
].
s space.
@@ -519,7 +527,7 @@
s nextPutAll:'}'; cr.
"Created: / 22.3.1997 / 14:29:37 / cg"
- "Modified: / 10.11.1998 / 12:25:56 / cg"
+ "Modified: / 12.11.1998 / 21:20:03 / cg"
!
methodDefinitionOf:aMethod inPackage:pckgName on:s
@@ -955,6 +963,6 @@
!JavaDecompiler class methodsFor:'documentation'!
version
- ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaDecompiler.st,v 1.36 1998/11/10 14:31:50 cg Exp $'
+ ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaDecompiler.st,v 1.37 1998/11/12 20:32:56 cg Exp $'
! !
JavaDecompiler initialize!
--- a/JavaUnresolvedClassConstant.st Thu Nov 12 20:32:20 1998 +0000
+++ b/JavaUnresolvedClassConstant.st Thu Nov 12 20:33:33 1998 +0000
@@ -178,6 +178,20 @@
^ true
"Created: / 20.10.1998 / 17:43:36 / cg"
+!
+
+package
+ "extract from the fullName"
+
+ |components|
+
+ components := fullName asCollectionOfSubstringsSeparatedBy:$/.
+ components size > 1 ifTrue:[
+ ^ (components copyWithoutLast:1) asStringWith:$/
+ ].
+ ^ fullName
+
+ "Created: / 12.11.1998 / 21:11:30 / cg"
! !
!JavaUnresolvedClassConstant methodsFor:'resolving'!
@@ -294,5 +308,5 @@
!JavaUnresolvedClassConstant class methodsFor:'documentation'!
version
- ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaUnresolvedClassConstant.st,v 1.32 1998/11/11 14:41:11 cg Exp $'
+ ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaUnresolvedClassConstant.st,v 1.33 1998/11/12 20:33:33 cg Exp $'
! !