--- a/src/JavaClassReader.st	Thu May 12 15:40:53 2011 +0000
+++ b/src/JavaClassReader.st	Thu May 12 16:07:20 2011 +0000
@@ -13,7 +13,7 @@
 
 Object subclass:#JavaClassReader
 	instanceVariableNames:'inStream msb constants majorVsn minorVsn constNeeds2Slots
-		constSlot classBeingRead'
+		constSlot classBeingLoaded'
 	classVariableNames:'Verbose AnnotationsVerbose Silent AbsolutelySilent
 		LazyClassLoading InvalidClassFormatSignal ClassLoaderQuerySignal
 		JavaArchiveCache UsedJavaClassReaderClass'
@@ -703,16 +703,6 @@
     "Created: / 09-05-2011 / 23:11:04 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
 ! !
 
-!JavaClassReader methodsFor:'* uncategorized *'!
-
-updateOwnerInCPItem: each 
-    ((each isJavaRef and: [ each isNewJavaRef ]) 
-        or: [ each isJavaNameAndType and: [ each isNewJavaNameAndType ] ]) 
-            ifTrue: [ each owner: classBeingRead ].
-
-    "Created: / 12-05-2011 / 17:40:46 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-! !
-
 !JavaClassReader methodsFor:'accessing'!
 
 constants   
@@ -884,34 +874,34 @@
             thisMetaClass := Metaclass new.
             thisMetaClass setSuperclass: super_class class.
             thisMetaClass instSize: (super_class class instSize + nStatic).
-            classBeingRead := thisMetaClass new.
-            classBeingRead setSuperclass: super_class.
-            classBeingRead setName: thisClassName asSymbol. ]
+            classBeingLoaded := thisMetaClass new.
+            classBeingLoaded setSuperclass: super_class.
+            classBeingLoaded setName: thisClassName asSymbol. ]
         ifFalse: 
             [ "/ a java class
-            classBeingRead := JavaClass fullName: thisClassName numStatic: nStatic.
+            classBeingLoaded := JavaClass fullName: thisClassName numStatic: nStatic.
             nStatic ~~ 0 
                 ifTrue: 
                     [ fields := fields select: [:f | f isStatic not ].
                     JavaClass setInstanceVariableStringFromFields: staticFields
-                        in: classBeingRead class.
-                    classBeingRead setStaticFields: staticFields.
-                    classBeingRead initializeStaticFields. ].
-            classBeingRead setAccessFlags: access_flags.
-            classBeingRead setSuperclass: super_class.
-            classBeingRead setConstantPool: constants.
-            classBeingRead setFields: fields.
-            classBeingRead setInterfaces: interfaces.
-            constants owner: classBeingRead. ].
+                        in: classBeingLoaded class.
+                    classBeingLoaded setStaticFields: staticFields.
+                    classBeingLoaded initializeStaticFields. ].
+            classBeingLoaded setAccessFlags: access_flags.
+            classBeingLoaded setSuperclass: super_class.
+            classBeingLoaded setConstantPool: constants.
+            classBeingLoaded setFields: fields.
+            classBeingLoaded setInterfaces: interfaces.
+            constants owner: classBeingLoaded. ].
     
     "/
     "/ get methods
     "/
     
-    self readMethodsFor: classBeingRead.
-    self readAttributesFor: classBeingRead.
-    classBeingRead constantPool do: [:each | self updateOwnerInCPItem: each ].
-    ^ classBeingRead.
+    self readMethodsFor: classBeingLoaded.
+    self readAttributesFor: classBeingLoaded.
+    classBeingLoaded constantPool do: [:each | self updateOwnerInCPItem: each ].
+    ^ classBeingLoaded.
 
     "
      JavaClassReader loadFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
@@ -2562,6 +2552,16 @@
     "Created: / 16.5.1998 / 01:04:19 / cg"
 ! !
 
+!JavaClassReader methodsFor:'helpers'!
+
+updateOwnerInCPItem: each 
+    ((each isJavaRef and: [ each isNewJavaRef ]) 
+        or: [ each isJavaNameAndType and: [ each isNewJavaNameAndType ] ]) 
+            ifTrue: [ each owner: classBeingLoaded ].
+
+    "Created: / 12-05-2011 / 17:40:46 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+! !
+
 !JavaClassReader class methodsFor:'documentation'!
 
 version