Filename.st
branchjv
changeset 18060 3708e12e9aa8
parent 18059 b882507b9fdf
parent 15253 4f865ffd9824
child 18066 89d51443ba6f
--- a/Filename.st	Tue May 21 21:58:09 2013 +0100
+++ b/Filename.st	Fri May 24 18:52:05 2013 +0100
@@ -1400,14 +1400,9 @@
 
 separator
     "return the file/directory separator.
-     This is to be redefined in concrete classes;
-     the following default usually leads to a flat view of
-     the fileSystem (huh - BS2000 ?)"
-
-    self isAbstract ifTrue:[
-       ^ ConcreteClass separator
-    ].
-    ^ $_
+     This is to be redefined in concrete classes."
+
+   ^ ConcreteClass separator
 
     "
      Filename separator
@@ -3076,6 +3071,7 @@
                 f := self construct:aFilenameString.
                 Error handle:[:ex |
                     f isDirectory ifFalse:[ ex reject ].
+
                     f recursiveRemoveAll.
                     f removeDirectory
                 ] do:[
@@ -3112,8 +3108,9 @@
      This one walks down the directory hierarchy, not using any OS
      command to do the remove."
 
-    self recursiveRemoveAll.
-    self remove
+    self 
+        recursiveRemoveAll;
+        remove.
 
     "
      'foo' asFilename makeDirectory.
@@ -3142,8 +3139,6 @@
         linkInfo := self linkInfo.
         (linkInfo notNil and:[linkInfo isDirectory]) ifTrue:[
             ok := OperatingSystem removeDirectory:osName
-"/        ] ifFalse:[
-"/            ok := OperatingSystem removeFile:osName
         ].
         ok ifFalse:[
             self exists ifTrue:[
@@ -5931,11 +5926,11 @@
 !Filename class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Filename.st,v 1.393 2013-05-07 15:29:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Filename.st,v 1.396 2013-05-15 17:28:19 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Filename.st,v 1.393 2013-05-07 15:29:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Filename.st,v 1.396 2013-05-15 17:28:19 stefan Exp $'
 ! !