--- a/FileOperation.st	Wed Dec 04 04:28:30 2013 +0000
+++ b/FileOperation.st	Wed Dec 04 15:23:14 2013 +0100
@@ -442,45 +442,46 @@
     |newFile fileString targetDirectory suffix|
 
     aDestFile isDirectory ifTrue:[
-	targetDirectory := aDestFile.
-	newFile := aDestFile construct:(aSourceFile baseName).
+        targetDirectory := aDestFile.
+        newFile := aDestFile construct:(aSourceFile baseName).
     ] ifFalse:[
-	targetDirectory := aDestFile directory.
-	newFile := aDestFile.
+        targetDirectory := aDestFile directory.
+        newFile := aDestFile.
     ].
 
     "/ do not copy if destination directory doest exist.
     (self checkDirectoryExists:targetDirectory) ifFalse:[
-	result := false.
-	^ self
+        result := false.
+        ^ self
     ].
     (newFile exists) ifTrue:[
-	((newFile asString = aSourceFile asString) and:[copyIfSameBoolean]) ifTrue:[
-	    [newFile exists] whileTrue:[
-		suffix := newFile suffix.
-		fileString := newFile baseName withoutSuffix, self class suffixForCopyOverExistingFile, '.', suffix.
-		newFile := targetDirectory construct:fileString.
-	    ].
-	] ifFalse:[
-	    overWriteWarningBoolean ifTrue:[
-		(self fileExistsDialogForNewFile:newFile oldFile:aSourceFile withCancel:false withRemoveIfSame:false) ifFalse:[
-		    result := false.
-		    ^ self.
-		]
-	    ] ifFalse:[
-		    result := false.
-		    ^ self.
-	    ]
-	].
+        ((newFile asString = aSourceFile asString) and:[copyIfSameBoolean]) ifTrue:[
+            [newFile exists] whileTrue:[
+                suffix := newFile suffix.
+                fileString := newFile baseName withoutSuffix, self class suffixForCopyOverExistingFile, '.', suffix.
+                newFile := targetDirectory construct:fileString.
+            ].
+        ] ifFalse:[
+            overWriteWarningBoolean ifTrue:[
+                (self fileExistsDialogForNewFile:newFile oldFile:aSourceFile withCancel:false withRemoveIfSame:false) ifFalse:[
+                    result := false.
+                    ^ self.
+                ]
+            ] ifFalse:[
+                    result := false.
+                    ^ self.
+            ]
+        ].
     ].
-    Error handle:[:ex|
-	"was not able to copy it"
-	WarningBox warn:'on copy file - ', ex errorString.
-	self errorString:('on copy file - ', ex description asString).
-	result := false.
-	^ self
+    StreamError handle:[:ex|
+        "was not able to copy it"
+        newFile remove.
+        WarningBox warn:'on copy file - ', ex description.
+        self errorString:('on copy file - ', ex description asString).
+        result := false.
+        ^ self
     ] do:[
-	self basicCopy:aSourceFile to:newFile.
+        self basicCopy:aSourceFile to:newFile.
     ].
     DirectoryContents flushCachedDirectoryFor:(aSourceFile directory).
     result := true.
@@ -1356,8 +1357,8 @@
     ].
     Error handle:[:ex|
         "was not able to copy it"
-        WarningBox warn:'Error in copy file Operation: ', ex errorString.
-        self errorString:('Error in copy file Operation- ', ex description asString).
+        WarningBox warn:'Error in move file operation: ', ex description.
+        self errorString:('Error in move file operation- ', ex description asString).
         result := false.
         ^ self
     ] do:[
@@ -1603,10 +1604,10 @@
 !FileOperation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.92 2013-08-22 13:54:43 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.93 2013-12-04 14:23:14 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.92 2013-08-22 13:54:43 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.93 2013-12-04 14:23:14 stefan Exp $'
 ! !