--- a/DebugView.st	Wed May 14 11:11:57 2008 +0200
+++ b/DebugView.st	Fri May 16 16:31:44 2008 +0200
@@ -1923,7 +1923,7 @@
 !
 
 initialize
-    |menuPanel mH panel bpanel bH bpanel1 bH1 bpanel2 bH2 codePanel oldLayout v|
+    |menu menuPanel mH panel bpanel bH bpanel1 bH1 bpanel2 bH2 codePanel oldLayout v|
 
     super initialize.
 
@@ -1944,9 +1944,11 @@
     mH := 0.
 
     menuPanel := MenuPanel in:self.
+    menuPanel receiver:self.
     menuPanel verticalLayout:false.
-    menuPanel menu:(self class menuSpec).
-    menuPanel receiver:self.
+    menu := self class menuSpec decodeAsLiteralArray.
+    menu findGuiResourcesIn:self.
+    menuPanel menu:menu.
 
     mH := menuPanel preferredExtent y.
     menuPanel origin:(0.0 @ 0.0) corner:(1.0 @ (mH)).
@@ -4308,30 +4310,31 @@
     source := codeView contents asString string.
     source := currentMethod source.
 
-    Error handle:[:ex |
-        Transcript showCR:ex description.
-    ] do:[
-        Compiler parseErrorSignal catch:[
-            tree := RBParser 
-                        parseMethod:source 
-                        onError: [:str :err ":nodesSoFar" | ].
-        ].
-        tree isNil ifTrue:[
-            Compiler parseErrorSignal handle:[:ex |
-            ] do:[
-                tree := RBParser 
-                            parseDoItMethodBody:source 
-                            onError: [:str :err ":nodesSoFar" | ].
-            ].
-        ].
-    ].
-    tree isNil ifTrue:[^ nil].
-
-    node := tree whichNodeIsContainedBy:interval.
-    node isNil ifTrue: [
-        node := DoWhatIMeanSupport findNodeIn:tree forInterval:interval
-    ].
-    ^ node
+^ DoWhatIMeanSupport findNodeForInterval:interval in:(source string).
+"/    Error handle:[:ex |
+"/        Transcript showCR:ex description.
+"/    ] do:[
+"/        Compiler parseErrorSignal catch:[
+"/            tree := RBParser 
+"/                        parseMethod:source 
+"/                        onError: [:str :err ":nodesSoFar" | ].
+"/        ].
+"/        tree isNil ifTrue:[
+"/            Compiler parseErrorSignal handle:[:ex |
+"/            ] do:[
+"/                tree := RBParser 
+"/                            parseDoItMethodBody:source 
+"/                            onError: [:str :err ":nodesSoFar" | ].
+"/            ].
+"/        ].
+"/    ].
+"/    tree isNil ifTrue:[^ nil].
+"/
+"/    node := tree whichNodeIsContainedBy:interval.
+"/    node isNil ifTrue: [
+"/        node := DoWhatIMeanSupport findNodeIn:tree forInterval:interval
+"/    ].
+"/    ^ node
 !
 
 findNodeIn:tree forInterval:interval
@@ -6089,7 +6092,7 @@
 !DebugView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.427 2008-03-08 17:24:46 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.428 2008-05-16 14:31:44 cg Exp $'
 ! !
 
 DebugView initialize!