--- a/FileOperation.st Thu Aug 04 11:59:27 2005 +0200
+++ b/FileOperation.st Fri Aug 05 11:34:33 2005 +0200
@@ -296,6 +296,12 @@
!FileOperation::Copy methodsFor:'accessing'!
colOfCopiedFiles
+ "obsolete - bad name"
+
+ ^ self collectionOfCopiedFiles
+!
+
+collectionOfCopiedFiles
colOfCopiedFiles isNil ifTrue:[
colOfCopiedFiles := OrderedCollection new.
].
@@ -312,6 +318,16 @@
self copyFile:aSourceFile to:aDestFile withOverWriteWarning:true copyFileIfSame:true
!
+copyFiles:aColOfSourceFiles to:aDirectory
+ ^ self copyFiles:aColOfSourceFiles to:aDirectory withOverWriteWarning:true.
+!
+
+copyFiles:aColOfSourceFiles to:aDirectory withOverWriteWarning:overWriteWarning
+ ^ self copyFiles:aColOfSourceFiles to:aDirectory withOverWriteWarning:overWriteWarning copyFileIfSame:true.
+! !
+
+!FileOperation::Copy methodsFor:'actions-basic'!
+
copyFile:aSourceFile to:aDestFile withOverWriteWarning:overWriteWarningBoolean copyFileIfSame:copyIfSameBoolean
|newFile fileString targetDirectory targetIsDirectory sourceIsDirectory suffix|
@@ -366,14 +382,6 @@
result := true.
!
-copyFiles:aColOfSourceFiles to:aDirectory
- ^ self copyFiles:aColOfSourceFiles to:aDirectory withOverWriteWarning:true.
-!
-
-copyFiles:aColOfSourceFiles to:aDirectory withOverWriteWarning:overWriteWarning
- ^ self copyFiles:aColOfSourceFiles to:aDirectory withOverWriteWarning:overWriteWarning copyFileIfSame:true.
-!
-
copyFiles:aColOfSourceFiles to:aDirectory withOverWriteWarning:overWriteWarning copyFileIfSame:copy
|newFile suffix fileString sourceIsDirectory overWriteExisting|
@@ -434,7 +442,7 @@
filename copyTo:newFile.
].
].
- self colOfCopiedFiles add:filename
+ self collectionOfCopiedFiles add:filename
]
].
DirectoryContents flushCachedDirectoryFor:aDirectory.
@@ -515,6 +523,26 @@
^ self createDirectoryIn:startDirectory initialAnswer:defaultDirectory
!
+createHardLinkIn:aFile
+ "create an new hard link in a files directory"
+
+ self createLinkIn:aFile soft:false.
+!
+
+createSoftLinkIn:aFile
+ "create an new soft link in a files directory"
+
+ self createLinkIn:aFile soft:true.
+!
+
+operationError:msg
+ self result:false.
+ Dialog warn:msg.
+ self errorString:msg.
+! !
+
+!FileOperation::Create methodsFor:'actions-basic'!
+
createDirectoryIn:startDirectory initialAnswer:initialAnswerArg
|resources initialAnswer msg startBaseName newName newDir|
@@ -616,12 +644,6 @@
].
!
-createHardLinkIn:aFile
- "create an new hard link in a files directory"
-
- self createLinkIn:aFile soft:false.
-!
-
createLinkIn:aFile soft:symbolic
"ask for the link target;
then, create an new soft or hard link in aFile's directory"
@@ -661,12 +683,6 @@
].
!
-createSoftLinkIn:aFile
- "create an new soft link in a files directory"
-
- self createLinkIn:aFile soft:true.
-!
-
doCreateLinkFrom:oldPath to:newPathArg soft:symbolic
"actually create a soft or hard link"
@@ -729,12 +745,6 @@
self createdFile:newPathFile.
self result:true.
].
-!
-
-operationError:msg
- self result:false.
- Dialog warn:msg.
- self errorString:msg.
! !
!FileOperation::Delete class methodsFor:'actions'!
@@ -765,6 +775,16 @@
!FileOperation::Delete methodsFor:'actions'!
+deleteFiles:colOfFiles
+ ^ self deleteFiles:colOfFiles confirm:true.
+!
+
+eraseFilesContentsBeforeRemoving:file
+ "intentionally left blank"
+! !
+
+!FileOperation::Delete methodsFor:'actions-basic'!
+
deleteFile:aFileOrDirectory
| file isDirectory |
@@ -795,10 +815,6 @@
"Modified: / 17-03-2004 / 12:42:02 / cg"
!
-deleteFiles:colOfFiles
- ^ self deleteFiles:colOfFiles confirm:true.
-!
-
deleteFiles:colOfFiles confirm:confirm
|resources answer nFilesToDelete ask labels values fileTypeString msg lbls vals|
@@ -895,10 +911,6 @@
].
].
].
-!
-
-eraseFilesContentsBeforeRemoving:file
- "intentionally left blank"
! !
!FileOperation::Erase methodsFor:'actions'!
@@ -907,7 +919,9 @@
"fill file with zeros"
self halt.
-!
+! !
+
+!FileOperation::Erase methodsFor:'actions-basic'!
eraseFilesContentsBeforeRemoving:file
"fill file with zeros (to be really erased from the disk)"
@@ -989,6 +1003,12 @@
!FileOperation::Move methodsFor:'accessing'!
colOfMovedFiles
+ "obsolete - bad name"
+
+ ^ self collectionOfMovedFiles
+!
+
+collectionOfMovedFiles
colOfMovedFiles isNil ifTrue:[
colOfMovedFiles := OrderedCollection new.
].
@@ -1007,6 +1027,18 @@
^ self moveFile:aSourceFile to:aDestFile withOverWriteWarning:overWriteWarning moveFileIfSame:true
!
+moveFiles:aColOfSourceFiles to:aDirectory
+
+ ^ self moveFiles:aColOfSourceFiles to:aDirectory withOverWriteWarning:true
+!
+
+moveFiles:aColOfSourceFiles to:aDirectory withOverWriteWarning:overWriteWarning
+
+ ^ self moveFiles:aColOfSourceFiles to:aDirectory withOverWriteWarning:overWriteWarning moveFileIfSame:true
+! !
+
+!FileOperation::Move methodsFor:'actions-basic'!
+
moveFile:aSourceFile to:aDestFile withOverWriteWarning:overWriteWarning moveFileIfSame:move
|newFile fileString targetDirectory targetIsDirectory suffix doMove|
@@ -1069,16 +1101,6 @@
result := true.
!
-moveFiles:aColOfSourceFiles to:aDirectory
-
- ^ self moveFiles:aColOfSourceFiles to:aDirectory withOverWriteWarning:true
-!
-
-moveFiles:aColOfSourceFiles to:aDirectory withOverWriteWarning:overWriteWarning
-
- ^ self moveFiles:aColOfSourceFiles to:aDirectory withOverWriteWarning:overWriteWarning moveFileIfSame:true
-!
-
moveFiles:aColOfSourceFiles to:aDirectory withOverWriteWarning:overWriteWarning moveFileIfSame:move
|newFile suffix fileString doMove doRemoveSource doRemoveDestination|
@@ -1165,7 +1187,7 @@
]
]
].
- self colOfMovedFiles add:filename
+ self collectionOfMovedFiles add:filename
]
].
DirectoryContents flushCachedDirectoryFor:aDirectory.
@@ -1199,7 +1221,7 @@
^ renamedFiles
! !
-!FileOperation::Rename methodsFor:'actions'!
+!FileOperation::Rename methodsFor:'actions-basic'!
renameFile:oldFile to:newName
"rename a file (or directory)"
@@ -1299,5 +1321,5 @@
!FileOperation class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.68 2005-07-13 15:49:29 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.69 2005-08-05 09:34:24 cg Exp $'
! !