--- a/JavaPackage.st Thu Nov 13 22:49:07 2014 +0100
+++ b/JavaPackage.st Fri Nov 14 10:52:45 2014 +0100
@@ -100,7 +100,7 @@
thisNamespace isBehavior ifFalse:[
self error:'name conflict: java package ' , aName , ' vs. global with the same name'.
].
- thisNamespace isJavaPackage ifFalse:[
+ (thisNamespace ~~ JAVA and:[thisNamespace isJavaPackage not]) ifTrue:[
self error:'name conflict: non-java package ' , aName , 'aleady exists'.
].
]
@@ -234,7 +234,7 @@
doesNotUnderstand: aMessage
| sel classOrPackage |
- Java isNil ifTrue:[
+ Java isNil ifTrue:[
"/ STX:LIBJAVA not loaded
^ super doesNotUnderstand: aMessage
].
@@ -333,7 +333,7 @@
!
version_SVN
- ^ '$Id: JavaPackage.st,v 1.1 2014-11-13 15:55:53 vrany Exp $'
+ ^ '$Id: JavaPackage.st,v 1.2 2014-11-14 09:52:45 vrany Exp $'
! !