Tools__SearchDialog.st
branchjv
changeset 12265 f1b3696cf042
parent 12262 d25ef6bb0ef3
child 12268 cb43ab66c093
--- a/Tools__SearchDialog.st	Tue Jul 24 18:17:26 2012 +0100
+++ b/Tools__SearchDialog.st	Wed Jul 25 10:51:30 2012 +0100
@@ -482,9 +482,7 @@
                 self addCheckBoxForEverywhere.
             ].
             self addCheckBoxForMethodList.
-            browser selectedMethods value size > 1 ifTrue:[
-                self addCheckBoxForSelectedMethods.
-            ].
+            self addCheckBoxForSelectedMethods.
             self addCheckBoxForSelectedMethodClasses.
             self addCheckBoxForSelectedMethodPackages.
         ] ifFalse:[
@@ -556,7 +554,7 @@
 
     self label:(resources string:'Search').
 
-    "Modified: / 29-02-2012 / 19:48:17 / cg"
+    "Modified: / 20-07-2012 / 11:37:57 / cg"
 ! !
 
 !SearchDialog methodsFor:'setup'!
@@ -805,36 +803,47 @@
 !
 
 addCheckBoxForSelectedMethodClasses
-    |b classes|
+    |b classes numClasses|
 
     classes := ((browser selectedMethods value ? #()) 
                     select:[:m | m mclass notNil]
                     thenCollect:[:m | m mclass theNonMetaclass]) asSet.
-    classes size == 1 ifTrue:[
+    numClasses := classes size.
+    numClasses == 0 ifTrue:[^ self]. "/ comment this to show, but disabled
+
+    numClasses == 1 ifTrue:[
         b := CheckBox label:(resources string:'Selected method''s class ("%1")'
                             with:classes first name).
     ] ifFalse:[
         b := CheckBox label:(resources string:'Selected methods'' classes (%1)'
-                            with:classes size).
+                            with:numClasses).
+        numClasses == 0 ifTrue:[
+            b disable
+        ].
     ].
     self addCheckBox:b forSearchArea:#listOfSelectedMethodClasses.
     ^ b.
 
-    "Modified: / 29-02-2012 / 19:42:33 / cg"
+    "Modified (comment): / 20-07-2012 / 11:40:44 / cg"
 !
 
 addCheckBoxForSelectedMethodPackages
-    |b packages|
+    |b packages numPackages|
 
     packages := ((browser selectedMethods value ? #()) 
                     collect:[:m | m package]) asSet.
+    numPackages := packages size.
+    numPackages size == 0 ifTrue:[^ self]. "/ comment this to show, but disabled
 
-    packages size == 1 ifTrue:[
+    numPackages == 1 ifTrue:[
         b := CheckBox label:(resources string:'Selected method''s package ("%1")'
                             with:packages first).
     ] ifFalse:[
         b := CheckBox label:(resources string:'Selected methods'' packages (%1)'
-                            with:packages size).
+                            with:numPackages).
+        numPackages == 0 ifTrue:[
+            b disable
+        ].
     ].
     self addCheckBox:b forSearchArea:#listOfSelectedMethodPackages.
     ^ b.
@@ -843,12 +852,17 @@
 !
 
 addCheckBoxForSelectedMethods
-    |b|
+    |b numSelected|
+
+    numSelected := browser selectedMethods value size.
+    numSelected == 0 ifTrue:[^ self]. "/ comment this to show, but disabled
 
-    b := CheckBox label:(resources string:'Selected methods (%1)'
-			with:browser selectedMethods value size).
+    b := CheckBox label:(resources string:'Selected methods (%1)' with:numSelected).
     self addCheckBox:b forSearchArea:#listOfSelectedMethods.
+    numSelected == 0 ifTrue:[b disable].
     ^ b.
+
+    "Modified (comment): / 20-07-2012 / 11:40:33 / cg"
 !
 
 addCheckBoxForSelectedPackage
@@ -1325,11 +1339,11 @@
 !SearchDialog class methodsFor:'documentation'!
 
 version_CVS
-    ^ '§Header: /cvs/stx/stx/libtool/Tools_SearchDialog.st,v 1.69 2012/02/29 18:50:58 cg Exp §'
+    ^ '§Header: /cvs/stx/stx/libtool/Tools_SearchDialog.st,v 1.70 2012/07/20 09:42:22 cg Exp §'
 !
 
 version_SVN
-    ^ '$Id: Tools__SearchDialog.st 8018 2012-07-18 17:00:57Z vranyj1 $'
+    ^ '$Id: Tools__SearchDialog.st 8022 2012-07-25 09:51:30Z vranyj1 $'
 ! !
 
 SearchDialog initialize!