--- a/Context.st	Mon Oct 14 08:00:12 2013 +0100
+++ b/Context.st	Wed Oct 23 12:21:12 2013 +0100
@@ -1767,12 +1767,8 @@
 
     receiverClass := receiver class.
 
-    (receiverClass == SmallInteger or:[receiverClass == Float]) ifTrue:[
-        aStream nextPut:$(. receiver printOn:aStream. aStream nextPutAll:') '.
-    ].
-
-    receiverClass isJavaClass ifTrue:[
-        receiverClass displayOn:aStream
+    receiverClass theNonMetaclass isJavaClass ifTrue:[
+        receiverClass theNonMetaclass displayOn:aStream
     ] ifFalse:[
 "/        (receiverClass isBehavior
 "/        and:[receiverClass isMeta
@@ -1782,6 +1778,7 @@
 "/        ] ifFalse:[
 "/            receiverClassName := receiverClass name.
 "/        ].
+"/ 
         (receiverClass name ? '????') printOn:aStream.
     ].
 
@@ -1813,14 +1810,25 @@
 
         implementorClass notNil ifTrue: [
             (implementorClass ~~ receiverClass) ifTrue: [
-                aStream nextPut:$(. 
-                (implementorClass name ? '???') printOn:aStream.
+                aStream nextPut:$(.
+                implementorClass isJavaClass ifTrue:[
+                    implementorClass displayOn: aStream
+                ] ifFalse:[
+                    (implementorClass name ? '???') printOn:aStream.
+                ].
                 aStream nextPut:$).
             ]
         ] ifFalse:[
-            self searchClass ~~ receiverClass ifTrue:[
+            | srchClass |
+
+            srchClass := self searchClass.
+            srchClass ~~ receiverClass ifTrue:[
                 aStream nextPut:$(. 
-                (self searchClass name ? '???') printOn:aStream.
+                srchClass isJavaClass ifTrue:[
+                    srchClass displayOn:aStream.
+                ] ifFalse:[
+                    (srchClass name ? '???') printOn:aStream.
+                ].
                 aStream nextPut:$).
             ].
             "
@@ -1842,7 +1850,7 @@
         ]
     ].
 
-    "Modified: / 13-06-2012 / 14:49:33 / cg"
+    "Created: / 23-10-2013 / 11:13:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 receiverPrintString