# HG changeset patch # User Stefan Vogel # Date 1396996305 -7200 # Node ID fe7fa2d23b0b2a63a7ffb9b0095e9ab1b49d2d01 # Parent 2ed966dc0816f9b01dc65629c6be6bc864560974 Do not refer to FileBrowser methods diff -r 2ed966dc0816 -r fe7fa2d23b0b FileOperation.st --- a/FileOperation.st Wed Apr 09 00:31:38 2014 +0200 +++ b/FileOperation.st Wed Apr 09 00:31:45 2014 +0200 @@ -179,7 +179,7 @@ checkDirectoryExists:aDirectory aDirectory exists ifFalse:[ - (Dialog confirm:(FileBrowser classResources + (Dialog confirm:(AbstractFileBrowser classResources stringWithCRs:'Non-existing directory: %1\\Create?' with:aDirectory asString) ) ifFalse:[ @@ -187,7 +187,7 @@ ]. aDirectory recursiveMakeDirectory. aDirectory exists ifFalse:[ - Dialog warn:(FileBrowser classResources + Dialog warn:(AbstractFileBrowser classResources string:'Failed to create directory: %1'). ^ false ]. @@ -1373,7 +1373,7 @@ |newFile suffix fileString doMove doRemoveSource doRemoveDestination| aDirectory exists ifFalse:[ - (Dialog confirm:(FileBrowser classResources + (Dialog confirm:(AbstractFileBrowser classResources stringWithCRs:'Non-existing directory "%1" .\Create ?' with:aDirectory asString allBold)) ifFalse:[ result := false. @@ -1381,7 +1381,7 @@ ]. aDirectory makeDirectory. aDirectory exists ifFalse:[ - Dialog warn:(FileBrowser classResources + Dialog warn:(AbstractFileBrowser classResources stringWithCRs:'Cannot create directory "%1" !!\Create ?.' with:aDirectory asString allBold). result := false. @@ -1571,43 +1571,43 @@ queryBox okText:(resources string:'Rename'). aColOfFiles size > 1 ifTrue:[ - b := queryBox addAbortButtonLabelled:(resources string:'Cancel All'). - b action:[^ self]. - queryBox addButton:(Button label:(resources string:'Rename All') action:[renameAll := true. queryBox okPressed]) before:(queryBox okButton). + b := queryBox addAbortButtonLabelled:(resources string:'Cancel All'). + b action:[^ self]. + queryBox addButton:(Button label:(resources string:'Rename All') action:[renameAll := true. queryBox okPressed]) before:(queryBox okButton). ]. aColOfFiles do:[:oldFile | - oldName := oldFile baseName asString. - lastNewName notNil ifTrue:[ - initialText := FileBrowser goodRenameDefaultForFile:oldName lastOld:lastOldName lastNew:lastNewName. - ]. - doRename := false. - (renameAll and:[initialText notNil]) ifTrue:[ - doRename := true. - newName := initialText. - ] ifFalse:[ - queryBox title:(resources string:'Rename %1 to:' with:(oldName allBold)). - queryBox initialText:(initialText ? oldName). - queryBox action:[:newEnteredName | newName := newEnteredName. doRename := true.]. - queryBox show "showAtPointer". - "/ queryBox accepted ifFalse:[self halt]. - ]. - doRename ifTrue:[ - (self renameFile:oldFile to:newName asString) ifTrue:[ - result := true - ]. - lastOldName := oldName. - lastNewName := newName. - ]. + oldName := oldFile baseName asString. + lastNewName notNil ifTrue:[ + initialText := DoWhatIMeanSupport goodRenameDefaultForFile:oldName lastOld:lastOldName lastNew:lastNewName. + ]. + doRename := false. + (renameAll and:[initialText notNil]) ifTrue:[ + doRename := true. + newName := initialText. + ] ifFalse:[ + queryBox title:(resources string:'Rename %1 to:' with:(oldName allBold)). + queryBox initialText:(initialText ? oldName). + queryBox action:[:newEnteredName | newName := newEnteredName. doRename := true.]. + queryBox show "showAtPointer". + "/ queryBox accepted ifFalse:[self halt]. + ]. + doRename ifTrue:[ + (self renameFile:oldFile to:newName asString) ifTrue:[ + result := true + ]. + lastOldName := oldName. + lastNewName := newName. + ]. ] ! ! !FileOperation class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.94 2014-01-05 13:20:00 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.95 2014-04-08 22:31:45 stefan Exp $' ! version_CVS - ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.94 2014-01-05 13:20:00 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.95 2014-04-08 22:31:45 stefan Exp $' ! !