class: Tools::SearchDialog
authorClaus Gittinger <cg@exept.de>
Fri, 28 Nov 2014 17:10:03 +0100
changeset 14948 f53b88a7b381
parent 14947 9dca60fd646c
child 14949 bb530ad0230c
class: Tools::SearchDialog changed: #setupToAskForMethodSearchTitle:forBrowser:searchWhat:searchArea:withCaseIgnore:withMatch:withMethodList:allowFind:allowBuffer:allowBrowser:withTextEntry:
Tools__SearchDialog.st
--- a/Tools__SearchDialog.st	Fri Nov 28 17:09:23 2014 +0100
+++ b/Tools__SearchDialog.st	Fri Nov 28 17:10:03 2014 +0100
@@ -360,9 +360,15 @@
 !
 
 setupToAskForMethodSearchTitle:title forBrowser:brwsrArg searchWhat:searchWhatArg 
-  searchArea:whereDefault withCaseIgnore:withCaseIgnore withMatch:withMatch 
-  withMethodList:withMethodList allowFind:allowFindArg allowBuffer:allowBufferArg 
-  allowBrowser:allowBrowserArg withTextEntry:withTextEntryArg 
+    searchArea:whereDefault withCaseIgnore:withCaseIgnore withMatch:withMatch 
+    withMethodList:withMethodList allowFind:allowFindArg allowBuffer:allowBufferArg 
+    allowBrowser:allowBrowserArg withTextEntry:withTextEntryArg 
+
+    "searchWhat:
+        one of:#selector 
+     searchArea:
+        one of: #everywhere
+    "
 
     |where ns methodNameSpaces methodPackages hPanel leftVerticalPanel rightVerticalPanel|
 
@@ -425,7 +431,7 @@
 
     whereRadioGroup := RadioButtonGroup new.
 
-    (selectedCategories size > 0 or:[ selectedClasses size > 0 ]) ifTrue:[
+    (selectedCategories notEmptyOrNil or:[ selectedClasses notEmptyOrNil ]) ifTrue:[
         self addCheckBoxForEverywhere.
         "/        classMethodListView notNil ifTrue:[
         "/            b := CheckBox label:(resources string:'Shown Methods').
@@ -445,7 +451,7 @@
             currentNamespace := methodNameSpaces first.
         ] ifFalse:[
             currentNamespace := browser currentNamespace.
-            selectedClasses size == 0 ifTrue:[
+            selectedClasses isEmptyOrNil ifTrue:[
                 |classesInAllSelectedCategories nameSpacesOfAllClassesInAllSelectedCategories|
                 classesInAllSelectedCategories := Smalltalk allClasses select:[:cls | selectedCategories includes:cls category].
                 nameSpacesOfAllClassesInAllSelectedCategories := classesInAllSelectedCategories collect:[:eachClass | eachClass topNameSpace].
@@ -487,10 +493,10 @@
                     ].
                 ].
 
-        selectedCategories size > 0 ifTrue:[
+        selectedCategories notEmptyOrNil ifTrue:[
             self addCheckBoxForSelectedClassCategory.
         ].
-        (selectedClasses size > 0 or:[ selectedMethods size > 0 ]) ifTrue:[
+        (selectedClasses notEmptyOrNil or:[ selectedMethods notEmptyOrNil ]) ifTrue:[
             self addCheckBoxForSelectedClass.
             self addCheckBoxForSelectedClassAndSuperclasses.
             self addCheckBoxForSelectedClassAndSubclasses.
@@ -515,14 +521,14 @@
             ].
         ].
     ].
-    searchAreas size == 0 ifTrue:[
+    searchAreas isEmptyOrNil ifTrue:[
         self addCheckBoxForEverywhere.
     ].
     self addCheckBoxForChangedClassesList.
 
     withMethodList ifTrue:[
         browser isMethodListBrowser ifTrue:[
-            searchAreas size == 0 ifTrue:[
+            searchAreas isEmptyOrNil ifTrue:[
                 self addCheckBoxForEverywhere.
             ].
             self addCheckBoxForMethodList.
@@ -530,14 +536,14 @@
             self addCheckBoxForSelectedMethodClasses.
             self addCheckBoxForSelectedMethodPackages.
         ] ifFalse:[
-            searchAreas size == 0 ifTrue:[
+            searchAreas isEmptyOrNil ifTrue:[
                 self addCheckBoxForEverywhere.
             ].
             self addCheckBoxForChangedMethodList.
         ].
     ].
 
-    searchAreas size == 0 ifTrue:[
+    searchAreas isEmptyOrNil ifTrue:[
         whereRadioGroup := #everywhere asValue.
         self addDummyCheckBoxForEverywhere.
     ] ifFalse:[
@@ -1405,11 +1411,11 @@
 !SearchDialog class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__SearchDialog.st,v 1.81 2014-07-04 10:27:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__SearchDialog.st,v 1.82 2014-11-28 16:10:03 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__SearchDialog.st,v 1.81 2014-07-04 10:27:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__SearchDialog.st,v 1.82 2014-11-28 16:10:03 cg Exp $'
 ! !