FileBrowser.st
changeset 5320 322c753155a1
parent 5200 65cde33029a4
child 5361 969a7f56c708
--- a/FileBrowser.st	Mon Oct 27 11:02:58 2003 +0100
+++ b/FileBrowser.st	Mon Oct 27 11:09:20 2003 +0100
@@ -2109,14 +2109,16 @@
      If its a file, change to its directory and select the file.
      If its text, paste it into the codeView."
 
-    |newDir newFile|
+    |newDir newFile realObject|
+
+    realObject := someObject theObject.
 
     someObject isFileObject ifTrue:[
         someObject isDirectory ifTrue:[
-            newDir := someObject theObject pathName.
+            newDir := realObject pathName.
         ] ifFalse:[
-            newDir := someObject theObject directoryName.
-            newFile := someObject theObject baseName.
+            newDir := realObject directoryName.
+            newFile := realObject baseName.
         ].
 
         newDir notNil ifTrue:[
@@ -2134,7 +2136,7 @@
     ].
 
     someObject isTextObject ifTrue:[
-        subView paste:someObject theObject.
+        subView paste:realObject.
         ^ self
     ].
 
@@ -2630,9 +2632,7 @@
 
         dir := currentDirectory asFilename.
         self label:myName , '- gathering file names ...'.
-        fileNames := dir recursiveDirectoryContents.
-        fileNames := fileNames collect:[:fn | dir construct:fn].
-        fileNames := fileNames select:[:fn | fn isDirectory not].
+        fileNames := dir recursiveDirectoryContentsAsFilenames select:[:fn | fn isDirectory not].
 
         self label:myName , '- gathering sizes ...'.
         infoDir := Dictionary new.
@@ -2732,9 +2732,7 @@
         result := Dictionary new.
 
         dir := currentDirectory asFilename.
-        fileNames := dir directoryContents.
-        fileNames := fileNames collect:[:fn | dir construct:fn].
-        fileNames := fileNames select:[:fn | fn isDirectory not].
+        fileNames := dir directoryContentsAsFilenames select:[:fn | fn isDirectory not].
 
         infoDir := Dictionary new.
         fileNames do:[:fn |
@@ -3627,8 +3625,7 @@
         and:[lastFileDiffDirectory notNil
         and:[lastFileDiffDirectory asFilename isDirectory]]) ifTrue:[
             f := lastFileDiffDirectory asFilename construct:sel.
-            (f exists
-            and:[f isReadable]) ifTrue:[
+            f isReadable ifTrue:[
                 orgName1 := f name
             ]
         ].
@@ -7848,5 +7845,5 @@
 !FileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.546 2003-09-19 17:05:37 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.547 2003-10-27 10:09:20 cg Exp $'
 ! !