--- a/FileOperation.st Fri Oct 11 15:10:25 2002 +0200
+++ b/FileOperation.st Fri Oct 11 15:37:52 2002 +0200
@@ -1,45 +1,45 @@
"{ Package: 'stx:libtool2' }"
Object subclass:#FileOperation
- instanceVariableNames:'errorString result'
- classVariableNames:''
- poolDictionaries:''
- category:'Interface-Support'
+ instanceVariableNames:'errorString result'
+ classVariableNames:''
+ poolDictionaries:''
+ category:'Interface-Support'
!
FileOperation subclass:#Copy
- instanceVariableNames:'colOfCopiedFiles'
- classVariableNames:''
- poolDictionaries:''
- privateIn:FileOperation
+ instanceVariableNames:'colOfCopiedFiles'
+ classVariableNames:''
+ poolDictionaries:''
+ privateIn:FileOperation
!
FileOperation subclass:#Create
- instanceVariableNames:'createdFile'
- classVariableNames:'LastCreatedDirectory LastCreatedFile'
- poolDictionaries:''
- privateIn:FileOperation
+ instanceVariableNames:'createdFile'
+ classVariableNames:'LastCreatedDirectory LastCreatedFile'
+ poolDictionaries:''
+ privateIn:FileOperation
!
FileOperation subclass:#Delete
- instanceVariableNames:'fileName'
- classVariableNames:''
- poolDictionaries:''
- privateIn:FileOperation
+ instanceVariableNames:'fileName'
+ classVariableNames:''
+ poolDictionaries:''
+ privateIn:FileOperation
!
FileOperation subclass:#Move
- instanceVariableNames:'colOfMovedFiles'
- classVariableNames:''
- poolDictionaries:''
- privateIn:FileOperation
+ instanceVariableNames:'colOfMovedFiles'
+ classVariableNames:''
+ poolDictionaries:''
+ privateIn:FileOperation
!
FileOperation subclass:#Rename
- instanceVariableNames:'renamedFiles'
- classVariableNames:''
- poolDictionaries:''
- privateIn:FileOperation
+ instanceVariableNames:'renamedFiles'
+ classVariableNames:''
+ poolDictionaries:''
+ privateIn:FileOperation
!
@@ -205,7 +205,7 @@
!FileOperation::Copy class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.7 2002-09-18 14:37:20 penk Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.8 2002-10-11 13:37:52 cg Exp $'
! !
!FileOperation::Copy methodsFor:'accessing'!
@@ -408,7 +408,7 @@
!FileOperation::Create class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.7 2002-09-18 14:37:20 penk Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.8 2002-10-11 13:37:52 cg Exp $'
! !
!FileOperation::Create methodsFor:'accessing'!
@@ -644,7 +644,7 @@
!FileOperation::Delete class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.7 2002-09-18 14:37:20 penk Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.8 2002-10-11 13:37:52 cg Exp $'
! !
!FileOperation::Delete methodsFor:'actions'!
@@ -783,7 +783,7 @@
!FileOperation::Move class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.7 2002-09-18 14:37:20 penk Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.8 2002-10-11 13:37:52 cg Exp $'
! !
!FileOperation::Move methodsFor:'accessing'!
@@ -948,78 +948,10 @@
^ instance
! !
-!FileOperation::Rename class methodsFor:'defaults'!
-
-goodRenameDefaultFor:oldName lastOld:lastOldName lastNew:lastNewName
- |prefix suffix lastNewSize lastOldSize t
- lastOldWOSuffix lastNewWOSuffix oldWOSuffix lastOldRest oldRest lastNewRest
- lastRemoved lastInserted|
-
- lastNewName isNil ifTrue:[ ^ nil].
-
- lastNewSize := lastNewName size.
- lastOldSize := lastOldName size.
-
- "/ intelligent default ...
- (lastNewName endsWith:lastOldName) ifTrue:[
- prefix := lastNewName copyTo:(lastNewSize - lastOldSize).
- ^ (prefix , oldName).
- ].
- (lastOldName endsWith:lastNewName) ifTrue:[
- prefix := lastOldName copyTo:(lastOldSize - lastNewSize).
- ^ (oldName copyFrom:prefix size+1).
- ].
- (lastOldName withoutSeparators = lastNewName) ifTrue:[
- "/ intelligent default ...
- ^ oldName withoutSeparators.
- ].
- (lastNewName startsWith:lastOldName) ifTrue:[
- "/ intelligent default ...
- suffix := lastNewName copyLast:(lastNewSize - lastOldSize).
- ^ (oldName , suffix).
- ].
- (lastOldName startsWith:lastNewName) ifTrue:[
- suffix := lastOldName copyLast:(lastOldSize - lastNewSize).
- (oldName endsWith:suffix) ifTrue:[
- ^ (oldName copyWithoutLast:suffix size).
- ]
- ].
-
- lastOldWOSuffix := lastOldName asFilename withoutSuffix name.
- lastNewWOSuffix := lastNewName asFilename withoutSuffix name.
- oldWOSuffix := oldName asFilename withoutSuffix name.
-
- prefix := lastOldWOSuffix commonPrefixWith:oldWOSuffix.
- (lastNewWOSuffix startsWith:prefix) ifTrue:[
- lastOldRest := lastOldWOSuffix copyFrom:prefix size + 1.
- lastNewRest := lastNewWOSuffix copyFrom:prefix size + 1.
- oldRest := oldWOSuffix copyFrom:prefix size + 1.
-
- (lastNewRest endsWith:lastOldRest) ifTrue:[
- t := lastNewRest copyWithoutLast:lastOldRest size.
- ^ ((prefix , t , oldRest) asFilename withSuffix:oldName asFilename suffix) name
- ].
- ].
-
- suffix := lastOldWOSuffix commonSuffixWith:lastNewWOSuffix.
- suffix size > 0 ifTrue:[
- "/ last change changed something at the beginning
- prefix := oldWOSuffix commonPrefixWith:lastOldWOSuffix.
- prefix size > 0 ifTrue:[
- "/ this name starts with the same characters
- lastRemoved := lastOldWOSuffix copyWithoutLast:suffix size.
- lastInserted := lastNewWOSuffix copyWithoutLast:suffix size.
- ^ lastInserted , (oldName copyFrom:lastRemoved size + 1)
- ].
- ].
-
- ^ nil
-! !
-
!FileOperation::Rename class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.7 2002-09-18 14:37:20 penk Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.8 2002-10-11 13:37:52 cg Exp $'
! !
!FileOperation::Rename methodsFor:'accessing'!
@@ -1086,16 +1018,9 @@
oldName := oldFile baseName asString.
queryBox title:('Rename ' , oldName , ' to:').
lastNewName notNil ifTrue:[
- initialText := self class
- goodRenameDefaultFor:oldName
- lastOld:lastOldName
- lastNew:lastNewName
+ initialText := FileBrowser goodRenameDefaultFor:oldName lastOld:lastOldName lastNew:lastNewName
].
- initialText notNil ifTrue:[
- queryBox initialText:initialText
- ] ifFalse:[
- queryBox initialText:oldName
- ].
+ queryBox initialText:(initialText ? oldName).
queryBox
action:[:newName |
(self renameFile:oldFile to:newName asString) ifTrue:[
@@ -1111,5 +1036,5 @@
!FileOperation class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.7 2002-09-18 14:37:20 penk Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.8 2002-10-11 13:37:52 cg Exp $'
! !