Tools_SearchDialog.st
changeset 10444 702c7ef1f1bc
parent 10377 0024b64778eb
child 10469 d9dc7aa63fd6
--- a/Tools_SearchDialog.st	Thu Aug 04 11:49:57 2011 +0200
+++ b/Tools_SearchDialog.st	Thu Aug 04 16:07:32 2011 +0200
@@ -20,8 +20,8 @@
 		currentPanel searchAreas caseHolder matchHolder isMethodHolder
 		codeField selectorHolder defaultOpenHow withTextEntry allowFind
 		allowBuffer allowBrowser searchWhat searchClassProtocolHolder
-		searchInstanceProtocolHolder selectorOrCode listHolder
-		matchProcess inputField'
+		searchInstanceProtocolHolder selectorOrCode selectionList
+		listHolder matchProcess inputField'
 	classVariableNames:'LastCodeSearched LastCodeSearchWasMethod LastGlobalSearched
 		LastStringSearched LastSearchWasMatch LastSearchWasCaseSensitive
 		LastStringSearchArea LastCodeSearchArea AREA_LISTOFMETHODS
@@ -208,7 +208,11 @@
             LastCodeSearched := code.
             LastCodeSearchArea := where.
         ] ifFalse:[
-            sel := selectorHolder value.
+            selectionList hasSelection ifTrue:[
+                sel := selectionList selectionValue.
+            ] ifFalse:[
+                sel := selectorHolder value.
+            ].
             sel isEmptyOrNil ifTrue:[ 
                 browser warn:((searchWhat == #selector) 
                             ifTrue:[ 'No selector entered for search'. ]
@@ -301,7 +305,7 @@
   withMethodList:withMethodList allowFind:allowFindArg allowBuffer:allowBufferArg 
   allowBrowser:allowBrowserArg withTextEntry:withTextEntryArg 
 
-    |where ns methodNameSpaces methodPackages hPanel leftVerticalPanel rightVerticalPanel l|
+    |where ns methodNameSpaces methodPackages hPanel leftVerticalPanel rightVerticalPanel|
 
     allowFind := allowFindArg.
     allowBuffer := allowBufferArg.
@@ -499,8 +503,8 @@
     "/ panel has its own idea of indenting
     self addVerticalSpace.
     searchWhat == #selector ifTrue:[
-        l := self addFilteredListOfMatchingSelectors.
-        self stickAtBottomWithVariableHeight:l.
+        selectionList := self addFilteredListOfMatchingSelectors.
+        self stickAtBottomWithVariableHeight:selectionList.
         matchHolder notNil ifTrue:[
             matchHolder onChangeEvaluate:[ self updateListOfMatchingSelectorsFor:inputField contents ]
         ].
@@ -1258,7 +1262,7 @@
 !SearchDialog class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_SearchDialog.st,v 1.62 2011-07-23 08:58:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_SearchDialog.st,v 1.63 2011-08-04 14:07:32 stefan Exp $'
 ! !
 
 SearchDialog initialize!