diff -r 91a7b38eb142 -r 6dde5ad32643 Rename.st
--- a/Rename.st	Wed Sep 04 12:29:17 2002 +0200
+++ b/Rename.st	Wed Sep 04 14:23:01 2002 +0200
@@ -10,25 +10,25 @@
 
 !Rename class methodsFor:'actions'!
 
-filesRename:aColOfFiles
+renameFile:oldFile to:newName
     "move from to
     "
 
     |instance|
 
     instance := self new.
-    instance filesRename:aColOfFiles.
+    instance renameFile:oldFile to:newName.
     ^ instance
 !
 
-renameFrom:oldFile to:newName
+renameFiles:aColOfFiles 
     "move from to
     "
 
     |instance|
 
     instance := self new.
-    instance renameFrom:oldFile to:newName.
+    instance renameFiles:aColOfFiles.
     ^ instance
 ! !
 
@@ -113,44 +113,7 @@
 
 !Rename methodsFor:'actions'!
 
-filesRename:aColOfFiles
-    "rename the selected file(s)"
-
-    |queryBox b lastNewName lastOldName initialText oldName|
-
-    queryBox := FilenameEnterBox new.
-    queryBox okText:'Rename'.
-    aColOfFiles size > 1 ifTrue:[
-        b := queryBox addAbortButtonLabelled:'Cancel All'.
-        b action:[^ self ].
-    ].
-
-    aColOfFiles do:[:oldFile |
-        oldName := oldFile baseName asString.
-        queryBox title:('Rename ', oldName, ' to:').
-
-        lastNewName notNil ifTrue:[
-            "/ intelligent default ...
-            initialText := self class goodRenameDefaultFor:oldName lastOld:lastOldName lastNew:lastNewName
-        ].
-        initialText notNil ifTrue:[
-            queryBox initialText:initialText.
-        ] ifFalse:[                                            
-            queryBox initialText:oldName.
-        ].
-        queryBox action:[:newName |
-            (self renameFrom:oldFile to:newName asString) ifTrue:[
-                result := true.   
-            ].
-            lastOldName := oldName.
-            lastNewName := newName.
-        ].
-
-        queryBox showAtPointer
-    ].
-!
-
-renameFrom:oldFile to:newName
+renameFile:oldFile to:newName
     "rename a file (or directory)"
 
     |old new msg|
@@ -184,6 +147,43 @@
         self renamedFiles add:new.
     ].
     result := true.
+!
+
+renameFiles:aColOfFiles 
+    "rename the selected file(s)"
+
+    |queryBox b lastNewName lastOldName initialText oldName|
+
+    queryBox := FilenameEnterBox new.
+    queryBox okText:'Rename'.
+    aColOfFiles size > 1 ifTrue:[
+        b := queryBox addAbortButtonLabelled:'Cancel All'.
+        b action:[^ self]
+    ].
+    aColOfFiles do:[:oldFile | 
+        oldName := oldFile baseName asString.
+        queryBox title:('Rename ' , oldName , ' to:').
+        lastNewName notNil ifTrue:[
+            initialText := self class 
+                        goodRenameDefaultFor:oldName
+                        lastOld:lastOldName
+                        lastNew:lastNewName
+        ].
+        initialText notNil ifTrue:[
+            queryBox initialText:initialText
+        ] ifFalse:[
+            queryBox initialText:oldName
+        ].
+        queryBox 
+            action:[:newName | 
+                (self renameFile:oldFile to:newName asString) ifTrue:[
+                    result := true
+                ].
+                lastOldName := oldName.
+                lastNewName := newName
+            ].
+        queryBox showAtPointer
+    ]
 ! !
 
 !Rename class methodsFor:'documentation'!