Mercurial Mercurial > hg > stx-libjava / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More fixes after Java class name refactoring. development
authorJan Vrany <jan.vrany@fit.cvut.cz>
Tue, 22 Oct 2013 23:21:20 +0100
branchdevelopment
changeset 2886 38bc44ad0f95
parent 2885 64b02ee49807
child 2887 2f98edaf6aba
More fixes after Java class name refactoring. Ssigh, we'll find more bugs in year time, I fear. We should have done it right at the beggining. now's too late.
tools/JavaToolbox.st file | annotate | diff | comparison | revisions 
--- a/tools/JavaToolbox.st	Tue Oct 22 18:50:11 2013 +0100
+++ b/tools/JavaToolbox.st	Tue Oct 22 23:21:20 2013 +0100
@@ -95,10 +95,10 @@
     | menu definingClasses implementors |
 
     menu := Menu new.
-    definingClasses := environment allClasses select:[:cls | cls name = className ].
+    definingClasses := environment allClasses select:[:cls | cls isJavaClass and:[cls binaryName = className ]].
     definingClasses do:[:cls|
         menu addItem: 
-            (MenuItem label: (self displayStringForSelector: selector in: cls name withClassName: true)
+            (MenuItem label: (self displayStringForSelector: selector in: cls binaryName withClassName: true)
                 itemValue:[ self spawnBrowserOnClass: cls selector: selector]). 
     ].
     implementors := Set new.
@@ -109,7 +109,7 @@
         menu addSeparator.
         implementors do:[:m|
             menu addItem: 
-                (MenuItem label: (self displayStringForSelector: selector in: m mclass name withClassName: true)
+                (MenuItem label: (self displayStringForSelector: selector in: m mclass binaryName withClassName: true)
                     itemValue:[ self spawnBrowserOnMethod: m]). 
         ].
     ].
@@ -117,7 +117,7 @@
     ^ menu
 
     "Created: / 24-09-2013 / 23:48:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 25-09-2013 / 10:06:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 22-10-2013 / 22:31:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 messagesMenuFor:actionSelector
@@ -172,7 +172,7 @@
     | menu definingClasses senders |
 
     menu := Menu new.
-    definingClasses := environment allClasses select:[:cls | cls name = className ].
+    definingClasses := environment allClasses select:[:cls | cls isJavaClass and:[cls binaryName = className ]].
     senders := Set new.
     definingClasses do:[:cls | senders addAll: (self searchForSendersOf: selector class: cls)].
     senders := senders reject:[:m | definingClasses includes: m mclass ].
@@ -180,7 +180,7 @@
     senders notEmptyOrNil ifTrue:[
         senders do:[:m|
             menu addItem: 
-                (MenuItem label: (self displayStringForSelector: selector in: m mclass name withClassName: true)
+                (MenuItem label: (self displayStringForSelector: selector in: m mclass binaryName withClassName: true)
                     itemValue:[ self spawnBrowserOnMethod: m]). 
         ].
     ].
@@ -188,6 +188,7 @@
     ^ menu
 
     "Created: / 25-09-2013 / 10:08:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 22-10-2013 / 22:30:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaToolbox methodsFor:'private-presentation'!
hg/stx-libjava