AbstractFileBrowser.st
changeset 18453 e20ac933ee00
parent 18433 4afda005ed69
child 18478 e88642b2a230
--- a/AbstractFileBrowser.st	Wed Oct 10 16:27:04 2018 +0200
+++ b/AbstractFileBrowser.st	Wed Oct 10 20:41:28 2018 +0200
@@ -6739,7 +6739,7 @@
         filesToConvert do:[:fileName |
             self notify:(resources string:'Converting: %1...' with:fileName baseName).
 
-            fileName isDirectory ifFalse:[
+            fileName isRegularFile ifTrue:[
                 |skip|
 
                 skip := false.
@@ -7319,7 +7319,7 @@
         ].
         fileNames := fileNames 
                         collect:[:fn | dir construct:fn]
-                        thenSelect:[:fn | fn isDirectory not].
+                        thenSelect:[:fn | fn isRegularFile].
 
 "/        self label:myName , '- gathering sizes ...'.
         infoDir := Dictionary new.
@@ -7442,7 +7442,7 @@
 
         self currentSelectedDirectories do:[:eachDir |
             eachDir recursiveDirectoryContentsAsFilenamesDo:[:eachFile |
-                eachFile isDirectory ifFalse:[
+                eachFile isRegularFile ifTrue:[
                     |sz possibleMatches|
 
                     sz := eachFile fileSize.
@@ -7791,7 +7791,7 @@
         |s|
 
         self notify:('Processing:',  fileName baseName).
-        fileName isDirectory ifFalse:[
+        fileName isRegularFile ifTrue:[
             [
                 |inFile outFile in out|
 
@@ -8106,7 +8106,7 @@
     files isEmpty ifTrue:[ ^ self].
     files do:[:fileName |
         path := fileName.
-        path isDirectory ifFalse:[
+        path isRegularFile ifTrue:[
             img := Image fromFile:(path pathName).
             img notNil ifTrue:[
                 aBlock value:img
@@ -8147,7 +8147,7 @@
         |p path|
 
         path := fileName.
-        path isDirectory ifFalse:[
+        path isRegularFile ifTrue:[
             p := Java 
                     javaProcessForMainOf:(Java classForName:'sun.applet.AppletViewer')
                     argumentString:path pathName.
@@ -8357,7 +8357,7 @@
     files := self currentSelectedObjects.
     files notEmpty ifTrue:[
         name1 := files first asFilename.
-        name1 asFilename isDirectory ifFalse:[
+        name1 asFilename isRegularFile ifTrue:[
             name1 := name1 directory
         ].
     ].
@@ -8379,7 +8379,7 @@
     ].
     name2 := name2 asFilename.
 
-    name2 asFilename isDirectory ifFalse:[
+    name2 asFilename isRegularFile ifTrue:[
         name2 := name2 directory
     ].
 
@@ -8952,8 +8952,8 @@
     kiloBytes isNil ifTrue:[^ self].
 
     selectedFiles do:[:fileName |
-        self notify:('Splitting:',  fileName baseName).
-        fileName isDirectory ifFalse:[
+        fileName isRegularFile ifTrue:[
+            self notify:('Splitting:',  fileName baseName).
             self splitFile:fileName intoPiecesOfSize:kiloBytes.
         ]
     ].
@@ -8979,8 +8979,8 @@
     numLines isNil ifTrue:[^ self].
 
     selectedFiles do:[:fileName |
-        self notify:('Splitting:',  fileName baseName).
-        fileName isDirectory ifFalse:[
+        fileName isRegularFile ifTrue:[
+            self notify:('Splitting:',  fileName baseName).
             self splitFile:fileName intoPiecesWithNumberOfLines:numLines
         ]
     ].
@@ -9008,8 +9008,8 @@
     selectedFiles do:[:fileName |
         |s|
 
-        self notify:('Truncating:',  fileName baseName).
-        fileName isDirectory ifFalse:[
+        fileName isRegularFile ifTrue:[
+            self notify:('Truncating:',  fileName baseName).
             [
                 s := fileName writeStream.
                 s close.
@@ -9601,7 +9601,7 @@
         |n|
 
         n := dir construct:f.
-        (n isReadable and:[n isDirectory not]) ifTrue:[
+        (n isReadable and:[n isRegularFile]) ifTrue:[
             ^ DirectoryContentsBrowser itemClass fileName:n
         ]
     ].