--- a/DirectoryContentsBrowser.st Sun Mar 30 15:04:24 2003 +0200
+++ b/DirectoryContentsBrowser.st Sun Mar 30 15:07:54 2003 +0200
@@ -1257,32 +1257,6 @@
!DirectoryContentsBrowser methodsFor:'drag & drop'!
-doDrop:aContext
-
- |col destinationPath receiver|
-
- draggedItem isNil ifTrue:[
- destinationPath := self directory.
- ] ifFalse:[
- destinationPath := self getDirWithoutFileName:(draggedItem fileName).
- destinationPath baseName = '..' ifTrue:[
- destinationPath := self directory directory.
- ]
- ].
- self dropLeave:aContext.
- aContext dropSource argument == #archivApplication ifTrue:[
- receiver := aContext dropSource receiver.
- receiver extractSelectedFilesTo:destinationPath askForExtractOptions:true.
- ^ true.
- ].
- col := OrderedCollection new.
- aContext dropObjects do:[:obj|
- col add:(obj theObject).
- ].
- self copyOrMoveFiles:col to:destinationPath.
- ^ true.
-!
-
doStartDrag:aDropSource in:aView
"set the cursors before starting the drag & drop operation
"
@@ -1295,6 +1269,21 @@
^ super doStartDrag:aDropSource in:aView
!
+dropDestinationPath
+ |destinationPath|
+
+ draggedItem isNil ifTrue:[
+ destinationPath := self directory.
+ ] ifFalse:[
+ destinationPath := self getDirWithoutFileName:(draggedItem fileName).
+ destinationPath baseName = '..' ifTrue:[
+ destinationPath := self directory directory.
+ ]
+ ].
+
+ ^ destinationPath
+!
+
dropOver:aDropContext
"called during drag & drop while moving over the widget."
@@ -2790,5 +2779,5 @@
!DirectoryContentsBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.92 2003-03-28 14:45:07 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.93 2003-03-30 13:07:52 cg Exp $'
! !
--- a/DirectoryTreeBrowser.st Sun Mar 30 15:04:24 2003 +0200
+++ b/DirectoryTreeBrowser.st Sun Mar 30 15:07:54 2003 +0200
@@ -788,26 +788,13 @@
!DirectoryTreeBrowser methodsFor:'drag & drop'!
-doDrop:aContext
- |col destination destinationPath receiver|
+dropDestinationPath
+ |destination|
destination := self fileList draggedItem.
- self dropLeave:aContext.
- destination ifNil:[^ false].
-
- destinationPath := destination fileName.
+ destination ifNil:[^ nil].
- aContext dropSource argument == #archivApplication ifTrue:[
- receiver := aContext dropSource receiver.
- receiver extractSelectedFilesTo:destinationPath askForExtractOptions:true.
- ^ true
- ].
- col := OrderedCollection new.
- aContext dropObjects do:[:obj |
- col add:(obj theObject)
- ].
- self copyOrMoveFiles:col to:destinationPath.
- ^ true
+ ^ destination fileName.
!
dropOver:aDropContext
@@ -1254,5 +1241,5 @@
!DirectoryTreeBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/DirectoryTreeBrowser.st,v 1.55 2003-03-24 16:59:37 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/DirectoryTreeBrowser.st,v 1.56 2003-03-30 13:07:54 cg Exp $'
! !