AbstractFileBrowser.st
changeset 5810 4661bf4c3bbf
parent 5789 b357cb31cc87
child 5828 67b58a435b3e
--- a/AbstractFileBrowser.st	Tue Mar 30 21:06:43 2004 +0200
+++ b/AbstractFileBrowser.st	Thu Apr 01 14:00:11 2004 +0200
@@ -4788,7 +4788,7 @@
             fileNames := dir recursiveDirectoryContents.
         ] on:FileStream openErrorSignal do:[:ex|
             self warn:('Cannot access: %1\(%2)' 
-                            bindWith:ex parameter printString
+                            bindWith:ex pathName
                             with:ex description) withCRs.
             ^ self
         ].
@@ -4914,14 +4914,17 @@
         directories do:[ : dir|
             [
                 fileNames := dir directoryContents.
-                fileNames := fileNames 
-                                collect:[:fn | dir construct:fn]
-                                thenSelect:[:fn | fn isDirectory not].
-                allFiles addAll:fileNames.
+                fileNames notNil ifTrue:[
+                    fileNames := fileNames 
+                                    collect:[:fn | dir construct:fn]
+                                    thenSelect:[:fn | fn isDirectory not].
+                    allFiles addAll:fileNames.
+                ]
             ] on:FileStream openErrorSignal do:[:ex|
                 self warn:('Cannot access: %1\(%2)' 
-                                bindWith:ex parameter printString
+                                bindWith:ex pathName
                                 with:ex description) withCRs.
+                ex proceedWith:nil.
             ].
         ].
 
@@ -6076,7 +6079,7 @@
     directories := self currentDirectories value.
     directories do:[:dir|
         [
-            (dir directoryContents do:[:f| (f asFilename suffix = suffix) ifTrue:[ ^ true]])
+            (dir directoryContentsAsFilenamesDo:[:fn | (fn suffix = suffix) ifTrue:[ ^ true]])
         ] on:FileStream openErrorSignal do:[:ex|].
     ].
     ^ false.
@@ -6719,5 +6722,5 @@
 !AbstractFileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.226 2004-03-22 22:00:36 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.227 2004-04-01 12:00:11 cg Exp $'
 ! !