merged in jv's chenges
authorClaus Gittinger <cg@exept.de>
Wed, 05 Feb 2014 19:57:42 +0100
changeset 13827 864b314a5a2b
parent 13826 78262bd89bea
child 13828 10a5fa91a449
merged in jv's chenges
Tools__VariableList.st
--- a/Tools__VariableList.st	Wed Feb 05 19:57:41 2014 +0100
+++ b/Tools__VariableList.st	Wed Feb 05 19:57:42 2014 +0100
@@ -528,6 +528,7 @@
     ^entry
 
     "Created: / 27-11-2011 / 17:17:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 07-10-2013 / 08:28:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 listOfVariables
@@ -779,12 +780,25 @@
     label isNil ifTrue:[
         label := name.
         type notNil ifTrue:[
-            label := (label , ' ' ,  (type displayString colorizeAllWith: Color brown)) 
+            label := (label , ' ' ,  (type displayString colorizeAllWith: Color brown))
+        ] ifFalse:[
+            "/ Hack for Java classes to display field type
+            class theNonMetaclass isJavaClass ifTrue:[
+                | field |
+                field := class theNonMetaclass lookupFieldFor:name static: (class isMetaclass) onlyPublic: false.
+                field notNil ifTrue:[
+                    label := label asText , 
+                            ' ' , 
+                                (('< ' , (JavaMethod fieldTypeFromStream: (field descriptor readStream) in: class theNonMetaclass javaPackage) , ' >')
+                                        asText colorizeAllWith: Color brown).
+                ].
+            ].    
         ].
     ].
     ^label
 
     "Created: / 16-12-2011 / 00:54:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 07-10-2013 / 08:29:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 labelWithClass
@@ -864,6 +878,6 @@
 !VariableList class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__VariableList.st,v 1.25 2013-09-05 10:46:11 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__VariableList.st,v 1.26 2014-02-05 18:57:42 cg Exp $'
 ! !