--- a/FileOperation.st Mon Oct 20 16:46:20 2008 +0200
+++ b/FileOperation.st Mon Oct 20 17:09:55 2008 +0200
@@ -1222,57 +1222,57 @@
targetIsDirectory := aDestFile isDirectory.
targetIsDirectory 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.
targetDirectory exists ifFalse:[
- Dialog warn:'Cannot move to non-existing directory ', targetDirectory asString.
- result := false.
- ^ self
+ Dialog warn:'Cannot move to non-existing directory ', targetDirectory asString.
+ result := false.
+ ^ self
].
(newFile exists) ifTrue:[
- ((newFile asString = aSourceFile asString) and:[move]) ifTrue:[
- [newFile exists] whileTrue:[
- suffix := newFile suffix.
- fileString := newFile baseName withoutSuffix, self class suffixForCopyOverExistingFile, '.', suffix.
- newFile := targetDirectory construct:fileString.
- ].
- ] ifFalse:[
- overWriteWarning ifTrue:[
- doMove := self fileExistsDialogForNewFile:newFile oldFile:aSourceFile withCancel:false withRemoveIfSame:true.
- doMove == #removeSource ifTrue:[
- self halt.
- result := false.
- ^ self.
- ].
- doMove == #removeDestination ifTrue:[
- self halt.
- result := false.
- ^ self.
- ].
- doMove == true ifFalse:[
- result := false.
- ^ self.
- ].
+ ((newFile asString = aSourceFile asString) and:[move]) ifTrue:[
+ [newFile exists] whileTrue:[
+ suffix := newFile suffix.
+ fileString := newFile baseName withoutSuffix, self class suffixForCopyOverExistingFile, '.', suffix.
+ newFile := targetDirectory construct:fileString.
+ ].
+ ] ifFalse:[
+ overWriteWarning ifTrue:[
+ doMove := self fileExistsDialogForNewFile:newFile oldFile:aSourceFile withCancel:false withRemoveIfSame:true.
+ doMove == #removeSource ifTrue:[
+ self halt:'unimplemented'.
+ result := false.
+ ^ self.
+ ].
+ doMove == #removeDestination ifTrue:[
+ self halt:'unimplemented'.
+ result := false.
+ ^ self.
+ ].
+ doMove == true ifFalse:[
+ result := false.
+ ^ self.
+ ].
- ] ifFalse:[
- result := false.
- ^ self.
- ]
- ].
+ ] ifFalse:[
+ result := false.
+ ^ self.
+ ]
+ ].
].
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).
- result := false.
- ^ self
+ "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).
+ result := false.
+ ^ self
] do:[
- aSourceFile moveTo:newFile.
+ aSourceFile moveTo:newFile.
].
DirectoryContents flushCachedDirectoryFor:(aSourceFile directory).
result := true.
@@ -1507,5 +1507,5 @@
!FileOperation class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.80 2008-10-04 11:29:51 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.81 2008-10-20 15:09:55 cg Exp $'
! !