--- a/src/JavaUnresolvedClassConstant.st	Thu Oct 20 17:10:04 2011 +0000
+++ b/src/JavaUnresolvedClassConstant.st	Thu Oct 20 18:20:15 2011 +0000
@@ -179,40 +179,33 @@
 !
 
 javaClass
-    | cls clsName |
+    | cls  clsName |
 
     "/fullName first == $[ ifTrue:[self halt].
-
-    fullName isNil ifTrue:[
+    fullName isNil ifTrue: [
         self preResolve.
-        fullName isNil ifTrue:[
-            self halt.
-        ]
+        fullName isNil ifTrue: [ self halt. ]
     ].
-    (fullName first = $[) 
-        ifTrue:
-            [cls := (JavaDescriptor fromString: fullName) javaClass]
-        ifFalse:
-            [cls := Java classForName:fullName].
+    (fullName first = $[) ifTrue: [
+        cls := (JavaDescriptor fromString: fullName) javaClass
+    ] ifFalse: [ cls := JavaVM classForName: fullName ].
     constantPool at: constantPoolIndex put: cls.
-    ^cls
+    ^ cls
 
     "old code:"
     "
-    (fullName startsWith:$[) ifTrue:[
+     (fullName startsWith:$[) ifTrue:[
         self halt.
         clsName := self className.
         (Java classForName:clsName) ifNil:
             [self error: 'Cannot resolve class ' , clsName].
         cls := (JavaDescriptor fromString: fullName) javaClass.
-    ] ifFalse:[
+     ] ifFalse:[
         clsName := fullName
-    ].
-    cls := Java classForName:clsName.
-    constantPool at: constantPoolIndex put: cls.
-    ^cls
-    "
-
+     ].
+     cls := Java classForName:clsName.
+     constantPool at: constantPoolIndex put: cls.
+     ^cls"
     "Modified: / 10-11-1998 / 19:29:28 / cg"
     "Modified: / 11-02-2011 / 07:53:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
@@ -400,4 +393,4 @@
 
 version_SVN
     ^ '$Id$'
-! !
\ No newline at end of file
+! !