SmallSense::CodeNavigationService - fix for new Java class naming scheme
authorJan Vrany <jan.vrany@fit.cvut.cz>
Mon, 14 Oct 2013 15:14:48 +0100
changeset 130 1274cc0394cb
parent 129 71e5c8bb9dc0
child 131 ea84eea5a3c4
SmallSense::CodeNavigationService - fix for new Java class naming scheme
SmallSense__CodeNavigationService.st
--- a/SmallSense__CodeNavigationService.st	Tue Oct 08 14:11:55 2013 +0100
+++ b/SmallSense__CodeNavigationService.st	Mon Oct 14 15:14:48 2013 +0100
@@ -207,7 +207,11 @@
     | className classes |
 
     className := node resolvedType compoundName asStringWith: $/.
-    classes := self environment allClasses select:[:cls | cls name = className ].
+    "/ Kludge - support both old and new Java class naming scheme
+    classes := (JavaClass canUnderstand: #binaryName) 
+                    ifTrue:[self environment allClasses select:[:cls | cls isJavaClass and:[cls binaryName = className]]]
+                    ifFalse:[self environment allClasses select:[:cls | cls isJavaClass and:[cls name = className]]].
+
     classes isEmpty ifTrue:[
         service codeView flash.
     ].
@@ -218,7 +222,7 @@
     self halt: 'Not yet supported'.
 
     "Created: / 24-09-2013 / 10:16:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 26-09-2013 / 08:55:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 14-10-2013 / 15:14:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !CodeNavigationService::Navigator methodsFor:'navigation - Smalltalk'!