AbstractFileBrowser.st
changeset 6373 16fb0a500e0d
parent 6371 b5dab61da244
child 6374 f9bed8385350
--- a/AbstractFileBrowser.st	Thu Aug 04 11:59:27 2005 +0200
+++ b/AbstractFileBrowser.st	Fri Aug 05 11:34:33 2005 +0200
@@ -3392,7 +3392,7 @@
         ].
         self updateCurrentDirectory.
     ].
-    ^ copy colOfCopiedFiles
+    ^ copy collectionOfCopiedFiles
 !
 
 copyOrMoveDialog:aCollectionOfFiles for:aDestinationDirectory
@@ -3514,21 +3514,20 @@
 !
 
 deleteFile:aFile
-    "delete current selected files/directories
-    "
+    "delete the selected files/directories"
 
     ^ self deleteFiles:(OrderedCollection with:aFile).
 !
 
 deleteFiles:colOfFiles
-    "delete current selected files/directories
-    "
+    "delete some files/directories"
+
     ^ self deleteFiles:colOfFiles confirm:true.
 !
 
 deleteFiles:colOfFiles confirm:confirm
-    "delete current selected files/directories
-    "
+    "delete some files/directories"
+
     |delete result|
 
     self windowGroup withWaitCursorDo:[
@@ -3546,14 +3545,14 @@
 !
 
 eraseFiles:colOfFiles
-    "delete current selected files/directories
-    "
+    "erase (clear and delete) some files/directories"
+
     ^ self eraseFiles:colOfFiles confirm:true.
 !
 
 eraseFiles:colOfFiles confirm:confirm
-    "erase current selected files/directories
-    "
+    "erase (clear and delete) some files/directories"
+
     |delete result|
 
     self windowGroup withWaitCursorDo:[
@@ -3571,7 +3570,7 @@
 !
 
 moveFile:aSourceFile to:aDestFile
-    "defete current selected files/directories"
+    "move a file/directory"
 
     |move|
 
@@ -3586,8 +3585,8 @@
 !
 
 moveFiles:aColOfSourceFiles to:aDirectory 
-   "move aColOfSourceFiles to aDirectory
-   "
+   "move some files to aDirectory"
+
     |move|
 
     self windowGroup withWaitCursorDo:[
@@ -3597,7 +3596,7 @@
         ].
         self updateCurrentDirectory.
     ].
-    ^ move colOfMovedFiles
+    ^ move collectionOfMovedFiles
 !
 
 moveSelectionTo
@@ -3685,7 +3684,6 @@
 !
 
 newLink:typeOfLink
-
     "ask for and create a symbolic if symbolic is true otherwise a hard link (unix only)"
 
     | sel dir create createdFile|
@@ -3716,12 +3714,15 @@
 !
 
 pasteFiles
-    "defete current selected files/directories
-    "
-    | buffer destination files directories copiedFiles|
+    "paste from clipBoard"
+
+    |buffer destination files directories copiedFiles thisIsAFileMoveOperation|
 
     files := self clipboard files.
     (files isNil or:[files isEmpty]) ifTrue:[ ^ self ].
+
+    thisIsAFileMoveOperation := self clipboard method == #cut.
+
     buffer := self clipboard copy.
     directories := self currentSelectedDirectories.
     directories size ~~ 1 ifTrue:[
@@ -3729,7 +3730,7 @@
 
         dirStringCol := directories collect:[:aDir| aDir asString].
         box := ListSelectionBox new.
-        box title:'In which directory you want to paste ?'.
+        box title:'Paste into which directory ?'.
         box list:dirStringCol.
         box okAction:[:sel | destination := sel asFilename].
         box show.
@@ -3737,7 +3738,8 @@
     ] ifFalse:[
         destination := directories anElement.
     ].
-    (self clipboard method == #cut) ifTrue:[
+
+    thisIsAFileMoveOperation ifTrue:[
         buffer files copy do:[:aFile|
             aFile directory = destination ifTrue:[
                 buffer files remove:aFile.
@@ -3745,9 +3747,12 @@
         ].
     ].
     copiedFiles := self copyFiles:(buffer files) to:destination.
-    (self clipboard method == #cut) ifTrue:[
+    thisIsAFileMoveOperation ifTrue:[
         self deleteFiles:copiedFiles confirm:false.
     ]. 
+    "/ select those pasted files.
+self halt.
+    self currentFileNameHolder value:buffer files.
 !
 
 renameFile:aFile 
@@ -3773,7 +3778,7 @@
 !
 
 renameFiles:aColOfFiles 
-    "rename the selected file(s)"
+    "rename some file(s)"
 
     |rename|
 
@@ -6794,5 +6799,5 @@
 !AbstractFileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.303 2005-08-02 15:34:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.304 2005-08-05 09:34:33 cg Exp $'
 ! !