Mercurial Mercurial > hg > stx-libtool / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
authorClaus Gittinger <cg@exept.de>
Wed, 07 Sep 2005 10:14:01 +0200
changeset 6379 443b9d779656
parent 6378 d29af7307c7c
child 6380 66cf2b1c0605
*** empty log message ***
NewSystemBrowser.st file | annotate | diff | comparison | revisions
Tools_SearchDialog.st file | annotate | diff | comparison | revisions
Tools__NewSystemBrowser.st file | annotate | diff | comparison | revisions 
--- a/NewSystemBrowser.st	Mon Sep 05 23:09:22 2005 +0200
+++ b/NewSystemBrowser.st	Wed Sep 07 10:14:01 2005 +0200
@@ -25518,29 +25518,30 @@
                 ].
                 brwsr switchToClassNamed:className.
             ].
-        ]
-    ] ifFalse:[
-        className includesMatchCharacters ifFalse:[
-            class := Smalltalk at:className asSymbol.
-            class isBehavior ifTrue:[
-                classes := Array with:class
-            ]
-        ] ifTrue:[
-            classes := Smalltalk allClasses select:[:each | className match:each name].
-            classes := classes asOrderedCollection.
-        ].
-        classes size == 0 ifTrue:[
-            ^ self warn:'No className matches'.
-        ].
-        doWhat isNil ifTrue:[
-            "/ select them ...
-            self immediateUpdate value:true.
-            self selectedCategories value: (classes collect:[:each | each category]) asSet asOrderedCollection.
-            self selectedClasses value:classes.
-            self immediateUpdate value:false.
-        ] ifFalse:[
-            self spawnClassBrowserFor:classes label:('classes matching ''',className,'''') in:doWhat select:false
-        ]
+        ].
+        ^ self.
+    ].
+
+    className includesMatchCharacters ifFalse:[
+        class := Smalltalk at:className asSymbol.
+        class isBehavior ifTrue:[
+            classes := Array with:class
+        ]
+    ] ifTrue:[
+        classes := Smalltalk allClasses select:[:each | className match:each name].
+        classes := classes asOrderedCollection.
+    ].
+    classes size == 0 ifTrue:[
+        ^ self warn:'No className matches'.
+    ].
+    doWhat isNil ifTrue:[
+        "/ select them ...
+        self immediateUpdate value:true.
+        self selectedCategories value: (classes collect:[:each | each category]) asSet asOrderedCollection.
+        self selectedClasses value:classes.
+        self immediateUpdate value:false.
+    ] ifFalse:[
+        self spawnClassBrowserFor:classes label:('classes matching ''',className,'''') in:doWhat select:false
     ]
 
     "Created: / 13.2.2000 / 20:35:30 / cg"
@@ -36898,7 +36899,7 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.851 2005-07-25 09:58:53 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.852 2005-09-07 08:13:52 cg Exp $'
 ! !
 
 NewSystemBrowser initialize!
--- a/Tools_SearchDialog.st	Mon Sep 05 23:09:22 2005 +0200
+++ b/Tools_SearchDialog.st	Wed Sep 07 10:14:01 2005 +0200
@@ -212,6 +212,14 @@
             currentNamespace := methodNameSpaces first.
         ] ifFalse:[
             currentNamespace := browser currentNamespace.
+            selectedClasses size == 0 ifTrue:[
+                |classesInAllSelectedCategories nameSpacesOfAllClassesInAllSelectedCategories|
+                classesInAllSelectedCategories := Smalltalk allClasses select:[:cls | selectedCategories includes:cls category].
+                nameSpacesOfAllClassesInAllSelectedCategories := classesInAllSelectedCategories collect:[:eachClass | eachClass topNameSpace].
+                nameSpacesOfAllClassesInAllSelectedCategories size == 1 ifTrue:[
+                    currentNamespace := nameSpacesOfAllClassesInAllSelectedCategories first.
+                ].
+            ].
         ].
         (currentNamespace notNil 
             and:[ currentNamespace ~= (browser nameListEntryForALL) ]) 
@@ -760,5 +768,5 @@
 !SearchDialog class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_SearchDialog.st,v 1.5 2005-07-13 15:35:57 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_SearchDialog.st,v 1.6 2005-09-07 08:14:01 cg Exp $'
 ! !
--- a/Tools__NewSystemBrowser.st	Mon Sep 05 23:09:22 2005 +0200
+++ b/Tools__NewSystemBrowser.st	Wed Sep 07 10:14:01 2005 +0200
@@ -25518,29 +25518,30 @@
                 ].
                 brwsr switchToClassNamed:className.
             ].
-        ]
-    ] ifFalse:[
-        className includesMatchCharacters ifFalse:[
-            class := Smalltalk at:className asSymbol.
-            class isBehavior ifTrue:[
-                classes := Array with:class
-            ]
-        ] ifTrue:[
-            classes := Smalltalk allClasses select:[:each | className match:each name].
-            classes := classes asOrderedCollection.
-        ].
-        classes size == 0 ifTrue:[
-            ^ self warn:'No className matches'.
-        ].
-        doWhat isNil ifTrue:[
-            "/ select them ...
-            self immediateUpdate value:true.
-            self selectedCategories value: (classes collect:[:each | each category]) asSet asOrderedCollection.
-            self selectedClasses value:classes.
-            self immediateUpdate value:false.
-        ] ifFalse:[
-            self spawnClassBrowserFor:classes label:('classes matching ''',className,'''') in:doWhat select:false
-        ]
+        ].
+        ^ self.
+    ].
+
+    className includesMatchCharacters ifFalse:[
+        class := Smalltalk at:className asSymbol.
+        class isBehavior ifTrue:[
+            classes := Array with:class
+        ]
+    ] ifTrue:[
+        classes := Smalltalk allClasses select:[:each | className match:each name].
+        classes := classes asOrderedCollection.
+    ].
+    classes size == 0 ifTrue:[
+        ^ self warn:'No className matches'.
+    ].
+    doWhat isNil ifTrue:[
+        "/ select them ...
+        self immediateUpdate value:true.
+        self selectedCategories value: (classes collect:[:each | each category]) asSet asOrderedCollection.
+        self selectedClasses value:classes.
+        self immediateUpdate value:false.
+    ] ifFalse:[
+        self spawnClassBrowserFor:classes label:('classes matching ''',className,'''') in:doWhat select:false
     ]
 
     "Created: / 13.2.2000 / 20:35:30 / cg"
@@ -36898,7 +36899,7 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.851 2005-07-25 09:58:53 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.852 2005-09-07 08:13:52 cg Exp $'
 ! !
 
 NewSystemBrowser initialize!
hg/stx-libtool