--- a/src/Java.st	Sun Oct 23 13:41:02 2011 +0000
+++ b/src/Java.st	Sun Oct 23 18:16:39 2011 +0000
@@ -716,24 +716,18 @@
 !Java class methodsFor:'enumerating'!
 
 allClasses
-    ^ Classes ? #()
 
-    "
-    |if|
+    ^JavaVM classRegistry classes
 
-    if := Java at:'java.awt.GraphicsEnvironment'.
-    Java allClasses select:[:aClass |
-                                aClass hasInterface:if
-                            ]
-    "
-
-    "Modified: / 28.1.1998 / 01:42:04 / cg"
+    "Modified: / 28-01-1998 / 01:42:04 / cg"
+    "Modified: / 23-10-2011 / 20:14:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 allClassesDo:aBlock
-    Classes notNil ifTrue:[
-        Classes do:aBlock
-    ]
+
+    ^JavaVM classRegistry classesDo: aBlock
+
+    "Modified: / 23-10-2011 / 20:14:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !Java class methodsFor:'object conversions'!
@@ -988,7 +982,8 @@
 !
 
 flushClasses
-    Classes := UnresolvedClassRefs := nil.
+    UnresolvedClassRefs := nil.
+    JavaVM classRegistry flush.
     Smalltalk keys copy do:[:aKey | 
         (aKey startsWith:'JAVA::') ifTrue:[ Smalltalk removeKey:aKey ]
     ].
@@ -1004,7 +999,8 @@
      Java flushClasses
     "
 
-    "Modified: / 6.11.2001 / 09:47:49 / cg"
+    "Modified: / 06-11-2001 / 09:47:49 / cg"
+    "Modified: / 23-10-2011 / 20:17:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 markAllClassesUninitialized
@@ -1036,6 +1032,9 @@
 
     |javaName sym nm cls p ns|
 
+    self breakPoint: #jv.
+    self breakPoint: #mh.    
+
     javaName := aJavaClass fullName.
 
     sym := javaName asSymbolIfInterned.
@@ -1074,7 +1073,8 @@
         ]
     ].
 
-    "Modified: / 19.10.1998 / 20:58:49 / cg"
+    "Modified: / 19-10-1998 / 20:58:49 / cg"
+    "Modified (format): / 23-10-2011 / 20:18:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 unresolvedClassRefFor:aClassName