FileOperation.st
branchjv
changeset 12807 ba8c5416aa28
parent 12431 9f0c59c742d5
parent 12726 536e7ac9c601
child 13356 51a964477563
--- a/FileOperation.st	Tue May 28 22:46:27 2013 +0100
+++ b/FileOperation.st	Fri May 31 00:35:44 2013 +0100
@@ -1500,58 +1500,58 @@
     |newFile msg resources sameFile|
 
     (oldFile isNil or:[newName isNil]) ifTrue:[
-	result := false.
-	^ self.
+        result := false.
+        ^ self.
     ].
     (oldFile asString isBlank or:[newName isBlank]) ifTrue:[
-	result := false.
-	^ self.
+        result := false.
+        ^ self.
     ].
     newName asFilename isAbsolute ifTrue:[
-	newFile := newName asFilename.
+        newFile := newName asFilename.
     ] ifFalse:[
-	(oldFile baseName = newName) ifTrue:[
-	    result := false
-	].
-	newFile := oldFile directory construct:newName.
+        (oldFile baseName = newName) ifTrue:[
+            result := false
+        ].
+        newFile := oldFile directory construct:newName.
     ].
 
     oldFile pathName = newFile pathName ifTrue:[
-	^ self.
+        ^ self.
     ].
     Filename isCaseSensitive ifFalse:[
-	sameFile := (oldFile pathName sameAs: newFile pathName)
+        sameFile := (oldFile pathName sameAs: newFile pathName)
     ] ifTrue:[
-	sameFile := false
+        sameFile := false
     ].
 
     resources := Dialog classResources.
 
-    OperatingSystem errorSignal handle:[:ex|
-	msg := resources
-		stringWithCRs:'Cannot rename file %1 to %2 !!\\(%3)'
-		with:oldFile baseName
-		with:newName
-		with:(OperatingSystem lastErrorString).
-	Dialog warn:msg.
-	result := false.
-	^ self.
+    OsError handle:[:ex|
+        msg := resources
+                stringWithCRs:'Cannot rename file %1 to %2 !!\\(%3)'
+                with:oldFile baseName
+                with:newName
+                with:(OperatingSystem lastErrorString).
+        Dialog warn:msg.
+        result := false.
+        ^ self.
     ] do:[
-	sameFile ifFalse:[
-	    newFile exists ifTrue:[
-		(newFile sameContentsAs:oldFile) ifTrue:[
-		    msg := '%1 exists [with same contents] - rename (i.e. overwrite) anyway ?'
-		] ifFalse:[
-		    msg := '%1 exists - rename (i.e. overwrite) anyway ?'
-		].
-		(Dialog confirmWithCancel:(resources string:msg with:newName allBold) default:false) ifFalse:[
-		    result := false.
-		    ^ self.
-		]
-	    ].
-	].
-	oldFile renameTo:newFile.
-	self renamedFiles add:newFile.
+        sameFile ifFalse:[
+            newFile exists ifTrue:[
+                (newFile sameContentsAs:oldFile) ifTrue:[
+                    msg := '%1 exists [with same contents] - rename (i.e. overwrite) anyway ?'
+                ] ifFalse:[
+                    msg := '%1 exists - rename (i.e. overwrite) anyway ?'
+                ].
+                (Dialog confirmWithCancel:(resources string:msg with:newName allBold) default:false) ifFalse:[
+                    result := false.
+                    ^ self.
+                ]
+            ].
+        ].
+        oldFile renameTo:newFile.
+        self renamedFiles add:newFile.
     ].
     result := true.
 
@@ -1601,11 +1601,11 @@
 !FileOperation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.90 2012-03-20 11:01:05 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.91 2013-04-27 12:59:37 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.90 2012-03-20 11:01:05 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.91 2013-04-27 12:59:37 cg Exp $'
 !
 
 version_HG