use different searchArea defaults
authorClaus Gittinger <cg@exept.de>
Mon, 11 Nov 1996 12:45:56 +0100
changeset 863 65769db0afe5
parent 862 291d323123b5
child 864 6ea7ea821b44
use different searchArea defaults for string and apropos search (they take a long time ...)
BrowserView.st
BrwsrView.st
--- a/BrowserView.st	Mon Nov 11 12:39:39 1996 +0100
+++ b/BrowserView.st	Mon Nov 11 12:45:56 1996 +0100
@@ -5530,8 +5530,9 @@
     self askForSearchTitle:'keyword to search for (in selector & comment):' 
                   openWith:#aproposSearch:in:
                 isSelector:true
-
-    "Modified: 10.7.1996 / 12:48:29 / cg"
+                searchArea:#class
+
+    "Modified: 11.11.1996 / 12:43:54 / cg"
 !
 
 methodBreakPoint
@@ -6405,11 +6406,13 @@
 methodStringSearch
     "launch an enterBox for string to search for"
 
-    self askForSearchTitle:'string to search for in sources:' 
-                  openWith:#browseForString:in:
-                isSelector:true
-
-    "Modified: 10.7.1996 / 10:33:44 / cg"
+    self 
+        askForSearchTitle:'string to search for in sources:' 
+        openWith:#browseForString:in:
+        isSelector:true
+        searchArea:#class
+
+    "Modified: 11.11.1996 / 12:44:13 / cg"
 !
 
 methodTrace
@@ -7016,15 +7019,32 @@
     "convenient method: setup enterBox with text from codeView or selected
      method for browsing based on a selector. Set action and launch box"
 
-    ^ self askForSearchTitle:title openWith:aSelector isSelector:true
-
-    "Modified: 10.7.1996 / 10:32:25 / cg"
+    ^ self 
+        askForSearchTitle:title 
+        openWith:aSelector 
+        isSelector:true
+
+    "Modified: 11.11.1996 / 12:43:24 / cg"
 !
 
 askForSearchTitle:title openWith:aSelector isSelector:isSelector
     "convenient method: setup enterBox with text from codeView or selected
      method for browsing based on a selector. Set action and launch box"
 
+    ^ self
+        askForSearchTitle:title 
+        openWith:aSelector 
+        isSelector:isSelector 
+        searchArea:#everywhere
+
+    "Modified: 11.11.1996 / 12:42:46 / cg"
+!
+
+askForSearchTitle:title openWith:aSelector isSelector:isSelector searchArea:whereDefault
+    "convenient method: setup enterBox with text from codeView or selected
+     method for browsing based on a selector. Set action and launch box.
+     SearchArea may be one of #everywhere, #classCategory, #class or #classHierarchy"
+
     |box grp panel selectorHolder where whereChannel b sel classes|
 
     isSelector ifTrue:[
@@ -7067,7 +7087,14 @@
             panel add:b. grp add:b.
             box makeTabable:b.
         ].
-        grp value:1.
+        whereDefault notNil ifTrue:[
+            where := (#(everywhere classCategory class classHierarchy)
+                      indexOf:whereDefault).
+            where == 0 ifTrue:[where := 1].
+        ] ifFalse:[
+            where := 1.
+        ].
+        grp value:where.
         whereChannel := grp valueChannel.
         box addComponent:panel indent:0.  "/ panel has its own idea of indenting
 
@@ -7105,8 +7132,8 @@
         ]
     ]
 
-    "Created: 10.7.1996 / 10:31:29 / cg"
-    "Modified: 10.9.1996 / 14:05:45 / cg"
+    "Created: 11.11.1996 / 12:42:14 / cg"
+    "Modified: 11.11.1996 / 12:43:13 / cg"
 !
 
 busyLabel:what with:someArgument
@@ -8450,6 +8477,6 @@
 !BrowserView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/BrowserView.st,v 1.217 1996-11-11 11:39:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/BrowserView.st,v 1.218 1996-11-11 11:45:56 cg Exp $'
 ! !
 BrowserView initialize!
--- a/BrwsrView.st	Mon Nov 11 12:39:39 1996 +0100
+++ b/BrwsrView.st	Mon Nov 11 12:45:56 1996 +0100
@@ -5530,8 +5530,9 @@
     self askForSearchTitle:'keyword to search for (in selector & comment):' 
                   openWith:#aproposSearch:in:
                 isSelector:true
-
-    "Modified: 10.7.1996 / 12:48:29 / cg"
+                searchArea:#class
+
+    "Modified: 11.11.1996 / 12:43:54 / cg"
 !
 
 methodBreakPoint
@@ -6405,11 +6406,13 @@
 methodStringSearch
     "launch an enterBox for string to search for"
 
-    self askForSearchTitle:'string to search for in sources:' 
-                  openWith:#browseForString:in:
-                isSelector:true
-
-    "Modified: 10.7.1996 / 10:33:44 / cg"
+    self 
+        askForSearchTitle:'string to search for in sources:' 
+        openWith:#browseForString:in:
+        isSelector:true
+        searchArea:#class
+
+    "Modified: 11.11.1996 / 12:44:13 / cg"
 !
 
 methodTrace
@@ -7016,15 +7019,32 @@
     "convenient method: setup enterBox with text from codeView or selected
      method for browsing based on a selector. Set action and launch box"
 
-    ^ self askForSearchTitle:title openWith:aSelector isSelector:true
-
-    "Modified: 10.7.1996 / 10:32:25 / cg"
+    ^ self 
+        askForSearchTitle:title 
+        openWith:aSelector 
+        isSelector:true
+
+    "Modified: 11.11.1996 / 12:43:24 / cg"
 !
 
 askForSearchTitle:title openWith:aSelector isSelector:isSelector
     "convenient method: setup enterBox with text from codeView or selected
      method for browsing based on a selector. Set action and launch box"
 
+    ^ self
+        askForSearchTitle:title 
+        openWith:aSelector 
+        isSelector:isSelector 
+        searchArea:#everywhere
+
+    "Modified: 11.11.1996 / 12:42:46 / cg"
+!
+
+askForSearchTitle:title openWith:aSelector isSelector:isSelector searchArea:whereDefault
+    "convenient method: setup enterBox with text from codeView or selected
+     method for browsing based on a selector. Set action and launch box.
+     SearchArea may be one of #everywhere, #classCategory, #class or #classHierarchy"
+
     |box grp panel selectorHolder where whereChannel b sel classes|
 
     isSelector ifTrue:[
@@ -7067,7 +7087,14 @@
             panel add:b. grp add:b.
             box makeTabable:b.
         ].
-        grp value:1.
+        whereDefault notNil ifTrue:[
+            where := (#(everywhere classCategory class classHierarchy)
+                      indexOf:whereDefault).
+            where == 0 ifTrue:[where := 1].
+        ] ifFalse:[
+            where := 1.
+        ].
+        grp value:where.
         whereChannel := grp valueChannel.
         box addComponent:panel indent:0.  "/ panel has its own idea of indenting
 
@@ -7105,8 +7132,8 @@
         ]
     ]
 
-    "Created: 10.7.1996 / 10:31:29 / cg"
-    "Modified: 10.9.1996 / 14:05:45 / cg"
+    "Created: 11.11.1996 / 12:42:14 / cg"
+    "Modified: 11.11.1996 / 12:43:13 / cg"
 !
 
 busyLabel:what with:someArgument
@@ -8450,6 +8477,6 @@
 !BrowserView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Attic/BrwsrView.st,v 1.217 1996-11-11 11:39:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Attic/BrwsrView.st,v 1.218 1996-11-11 11:45:56 cg Exp $'
 ! !
 BrowserView initialize!