--- a/src/JavaClassReader.st	Thu Oct 20 14:37:20 2011 +0000
+++ b/src/JavaClassReader.st	Thu Oct 20 17:10:04 2011 +0000
@@ -238,8 +238,8 @@
     (JavaDescriptor isJavaPrimitiveArrayName: className) ifTrue: [
         ^ (JavaDescriptor fromString: className) javaClass.
     ].
-    (cls := Java javaRegistry at: clsName) ifNotNil: [ ^ cls. ].
-    clsName := self getCleanClassNameFrom: className.
+    clsName := className asSTXInternalJavaClassName.
+    (cls := Java javaRegistry at: clsName) ifNotNil: [ ^ cls. ].    
     (classesBeingLoadedOrNil notNil 
         and: [ classesBeingLoadedOrNil includes: clsName ]) 
             ifTrue: [ self halt: 'recursive load - should not happen'. ].
@@ -268,12 +268,10 @@
                         nm := p , tryName , '.class'.
                         nm asFilename exists ifTrue: [
                             (Java isExcludedFromClassPath: nm) ifFalse: [
-                                self breakPoint:#mh.
-                                "means we are successfully going to read something :)"
+                                self breakPoint: #mh.
+                                 "means we are successfully going to read something :)"
                                 rslt := self readFile: nm ignoring: classesBeingLoaded.
-                                rslt notNil ifTrue: [                                   
-                                    ^ rslt.
-                                ].
+                                rslt notNil ifTrue: [ ^ rslt. ].
                             ]
                         ].
                     ]
@@ -304,7 +302,6 @@
         ]
     ].
 
-  
     "Created: / 15-04-1996 / 14:58:53 / cg"
     "Modified: / 20-10-1998 / 17:24:54 / cg"
     "Modified: / 08-09-2011 / 08:10:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -385,11 +382,6 @@
         cleanClassName := cleanClassName asString copyReplaceAll: $. with: $/
     ].
     ^ cleanClassName.
-!
-
-makeArrayOf: loadedJavaClass withDimensions: numOfDimensions 
-    self breakPoint: #mh.
-    ^Java javaRegistry makeArrayOf:loadedJavaClass withDimensions:numOfDimensions.
 ! !
 
 !JavaClassReader class methodsFor:'obsolete'!
@@ -629,7 +621,9 @@
     
     classBeingLoaded fields do: [:each | self updateOwnerInField: each ].
     classBeingLoaded staticFields do: [:each | self updateOwnerInField: each ].
-    Java javaRegistry addClass: classBeingLoaded definedBy:classBeingLoaded classLoader.
+    self breakPoint:#mh.
+    Java javaRegistry addClass: classBeingLoaded
+        definedBy: classBeingLoaded classLoader.
     classBeingLoaded classInit.
     classesbeingLoaded remove: classBeingLoaded name.
     ^ classBeingLoaded.