--- a/Java.st Wed May 10 13:05:58 2000 +0000
+++ b/Java.st Wed May 10 14:32:10 2000 +0000
@@ -1208,7 +1208,7 @@
p := aJavaClass nameSpacePath.
p knownAsSymbol ifTrue:[
ns := Smalltalk at:p asSymbol.
- (ns notNil and:[ns isNamespace]) ifTrue:[
+ (ns notNil and:[ns isNameSpace]) ifTrue:[
Smalltalk removeKey:(p , '::' , aJavaClass lastName) asSymbol
]
].
@@ -1498,6 +1498,6 @@
!Java class methodsFor:'documentation'!
version
- ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/Java.st,v 1.121 2000/02/14 18:57:23 cg Exp $'
+ ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/Java.st,v 1.122 2000/05/10 14:32:10 cg Exp $'
! !
Java initialize!
--- a/JavaClass.st Wed May 10 13:05:58 2000 +0000
+++ b/JavaClass.st Wed May 10 14:32:10 2000 +0000
@@ -178,7 +178,7 @@
]
]
].
- ns isNamespace ifTrue:[
+ ns isNameSpace ifTrue:[
ns at:nameComponents last asSymbol put:cls.
].
@@ -1743,6 +1743,6 @@
!JavaClass class methodsFor:'documentation'!
version
- ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaClass.st,v 1.112 2000/05/10 13:05:58 cg Exp $'
+ ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaClass.st,v 1.113 2000/05/10 14:32:10 cg Exp $'
! !
JavaClass initialize!
--- a/loadClasses Wed May 10 13:05:58 2000 +0000
+++ b/loadClasses Wed May 10 14:32:10 2000 +0000
@@ -61,27 +61,10 @@
'SmalltalkAppletStub'
).
-(Smalltalk loadClassLibraryIfAbsent:'libjava') ifTrue:[
- |handle loaded|
-
- loaded := OrderedCollection new.
- handle := ObjectFileLoader loadedObjectHandles
- detect:[:h | |cls|
- cls := h classes firstIfEmpty:nil.
- cls notNil and:[cls package = 'stx:libjava']
- ]
- ifNone:nil.
- handle notNil ifTrue:[
- handle classes do:[:c| c isMeta ifFalse:[loaded add:c classFilename]].
- ].
- files := files asOrderedCollection.
- loaded do:[:f| files remove:f ifAbsent:[]].
-].
-
files size > 0 ifTrue:[
files do:[:s|
'.' print.
- Smalltalk fileIn:s.
+ Smalltalk fileIn:(s , '.st').
].
' ' printCR.
].