Fix for JBrowser: use Class>>nameInBrowser for Java classes as well.
authorJan Vrany <jan.vrany@fit.cvut.cz>
Wed, 25 Feb 2015 16:00:16 +0100
changeset 15416 d2a4747c435d
parent 15415 2b7d8a2b82bb
child 15417 b016646da2a3
Fix for JBrowser: use Class>>nameInBrowser for Java classes as well.
Tools__ClassList.st
--- a/Tools__ClassList.st	Wed Feb 25 14:38:06 2015 +0100
+++ b/Tools__ClassList.st	Wed Feb 25 16:00:16 2015 +0100
@@ -2003,10 +2003,16 @@
     aClass isJavaClass ifTrue:[
         "/ only show the last name, unless multiple packages are shown in the list
         javaPackage := aClass package.
-        (self classList value contains:[:cls | cls package ~= javaPackage]) ifTrue:[
-            ^ nm 
-        ].        
-        ^ aClass lastName replaceAll: $$ with: $.
+        (self classList value contains:[:cls | cls package ~= javaPackage]) ifFalse:[
+            | i |
+
+            i := nm string indexOfNonSeparator.
+            nm := nm copyFrom: i + (aClass javaPackage size + 1).     
+            i > 0 ifTrue:[ 
+                nm := (String new: i - 1) , nm
+            ].
+        ].
+        ^ nm
     ].
 
     useFullName ifFalse:[
@@ -2040,7 +2046,7 @@
     ^ nm
 
     "Modified: / 04-07-2011 / 19:00:45 / cg"
-    "Modified: / 07-05-2014 / 13:46:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 25-02-2015 / 16:02:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 nameListIndentStringFor:aClass withNameSpace:useFullName
@@ -2125,10 +2131,10 @@
 !ClassList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__ClassList.st,v 1.90 2015-02-13 11:07:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__ClassList.st,v 1.91 2015-02-25 15:00:16 vrany Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__ClassList.st,v 1.90 2015-02-13 11:07:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__ClassList.st,v 1.91 2015-02-25 15:00:16 vrany Exp $'
 ! !