Tools_SearchDialog.st
changeset 7378 4c1785cf6bb6
parent 7374 0efb6827e9de
child 7384 8af5e37f3dea
--- a/Tools_SearchDialog.st	Mon Oct 09 12:48:34 2006 +0200
+++ b/Tools_SearchDialog.st	Mon Oct 09 12:48:45 2006 +0200
@@ -838,10 +838,12 @@
 getClassesAndMethodsFor:where 
     where == #everywhere ifTrue:[ 
         classes := Smalltalk allClasses.
+        methods := nil.
         ^ self.
     ].
     where == #currentNameSpace ifTrue:[ 
         classes := currentNamespace allClassesWithAllPrivateClasses.
+        methods := nil.
         ^ self.
     ].
     where == #currentClassesNameSpace ifTrue:[ 
@@ -851,35 +853,40 @@
         ] ifFalse:[ 
             classes := currentClass nameSpace allClassesWithAllPrivateClasses.
         ].
+        methods := nil.
         ^ self.
     ].
     where == #currentPackage ifTrue:[ 
         classes := Smalltalk allClassesInPackage:currentPackage. 
+        methods := nil.
         ^ self.
     ].
     where == #currentClassesPackage ifTrue:[ 
         classes := Smalltalk allClassesInPackage:currentClass package. 
+        methods := nil.
         ^ self.
     ].
     where == #classCategories ifTrue:[ 
         classes := Smalltalk allClasses 
                     select:[ :cls | selectedCategories includes:cls category. ].
         classes := classes collect:[ :each | each theNonMetaclass. ].
+        methods := nil.
         ^ self.
     ].
     (where == #classes or:[ where == #classesWithPrivateClasses. ]) ifTrue:[ 
         classes := selectedClasses collect:[ :each | each theNonMetaclass. ].
+        methods := nil.
         ^ self.
     ].
-    (where == #classHierarchies 
-        or:[ where == #classHierarchiesWithPrivateClasses. ]) 
-            ifTrue:[ 
-                classes := IdentitySet new.
-                selectedClasses do:[ :cls | 
-                    classes addAll:cls theNonMetaclass withAllSubclasses.
-                ].
-                ^ self.
-            ].
+    (where == #classHierarchies or:[ where == #classHierarchiesWithPrivateClasses. ]) 
+    ifTrue:[ 
+        classes := IdentitySet new.
+        selectedClasses do:[ :cls | 
+            classes addAll:cls theNonMetaclass withAllSubclasses.
+        ].
+        methods := nil.
+        ^ self.
+    ].
     where == #ownersWithPrivateClasses ifTrue:[ 
         classes := IdentitySet new.
         selectedClasses do:[ :cls | 
@@ -888,6 +895,7 @@
             c := cls theNonMetaclass.
             classes add:(c owningClass ? c).
         ].
+        methods := nil.
         ^ self.
     ].
     where == #ownersHierarchiesWithPrivateClasses ifTrue:[ 
@@ -898,6 +906,7 @@
             c := cls theNonMetaclass.
             classes addAll:(c owningClass ? c) withAllSubclasses.
         ].
+        methods := nil.
         ^ self.
     ].
     (where == #classesAndSuperclasses) ifTrue:[ 
@@ -905,6 +914,7 @@
         selectedClasses do:[ :cls | 
             classes addAll:cls theNonMetaclass withAllSuperclasses.
         ].
+        methods := nil.
         ^ self.
     ].
     (where == #listOfMethods) ifTrue:[ 
@@ -918,6 +928,8 @@
         ^ self.
     ].
 "/    self halt.
+
+    "Modified: / 09-10-2006 / 12:34:40 / cg"
 !
 
 isMethodHolder
@@ -1007,5 +1019,5 @@
 !SearchDialog class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_SearchDialog.st,v 1.19 2006-10-09 09:11:05 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_SearchDialog.st,v 1.20 2006-10-09 10:48:45 cg Exp $'
 ! !