hg/stx-libtool: comparison FileApplicationNoteBook.st

equal deleted inserted replaced

-:681d6bada0bc
+:9224c562e352
 "stub code automatically generated - please change as required"
 | appl sel|
 changedObject == self currentDirectories ifTrue:[
 self viewDirectoryDescription value ifTrue:[
 self changeDirectoryDescription.
 ].
 ^ self.
 #(#WindowSpec
 #label: 'Archive Application'
 #name: 'Archive Application'
 #min: #(#Point 10 10)
 #max: #(#Point 1024 768)
-#bounds: #(#Rectangle 16 42 692 534)
+#bounds: #(#Rectangle 16 46 692 538)
 #menu: #mainMenu
 )
 #component:
 #(#SpecCollection
 #collection: #(
 #textDefault: true
 )
 #(#'FileBrowserV2UISpecifications::PanelSpec'
 #name: 'VerticalPanel'
 #layout: #(#LayoutFrame 0 0.0 32 0.0 0 1.0 0 1.0)
-#borderWidth: 1
+#level: 0
 #whichView: #last
 #orientation: #vertical
 #visibility: #errorListVisibilityHolder
 #component:
 #(#SpecCollection
 #multipleSelectOk: true
 #verticalSpacing: 0
 #postBuildCallback: #postBuildFileTable:
 #properties:
 #(#PropertyListDictionary
-#dropSelector: #doDrop:
+#enterSelector: #dropEnter:
 #dragArgument: #archivApplication
 #startDragSelector: #doStartDrag:in:
 #displayObjectSelector: #getDisplayObjects:
 #dropObjectSelector: #getDropObjects:
 #overSelector: nil
 #dropArgument: #archivApplication
 #canDropSelector: #canDrop:
 #leaveSelector: #dropLeave:
-#enterSelector: #dropEnter:
+#dropSelector: #doDrop:
 )
 )
 #(#SequenceViewSpec
 #name: 'ErrorList'
 #initiallyDisabled: true
 columnDescriptors add:col.
 ].
 !
 item:aItem
-"set the value of the instance variable 'item' (automatically generated)"
 | classSelector|
 super item:aItem.
 self removeErrorOutput.
 classSelector := self class classSelectorFor:aItem.
 (classSelector notNil and:[(Archiver respondsTo:classSelector) notNil]) ifTrue:[
-self makeProcessFor:[
+self
-self archiver:((Archiver perform:classSelector) with:(self fileName)).
+makeProcessFor:[
-self setColumnsForArchiver.
+self archiver:((Archiver perform:classSelector) with:(self fileName)).
-] with:'setup archiv'.
+self setColumnsForArchiver.
+]
+with:'Setup archive'.
 ^ true
 ].
 ^ false
 !
 ^ temporaryDirectory
 ! !
 !FileApplicationNoteBook::ArchiveViewApplication methodsFor:'actions'!
 changeItem:aItem
 self item:aItem.
-self emptyList.
+self clearFileList.
-self listAllFilesFromArchiv.
+self listAllFilesFromArchive.
 ^ true
+!
+clearFileList
+self archiveFileList value removeAll.
 !
 copyFilesToClipboard
 archiver := self archiver.
 archiver notNil ifTrue:[
 self archiver stopProcess.
 ].
 self enableStopButton value:false.
-!
-emptyList
-self archiveFileList value removeAll.
 !
 removeErrorOutput
 self viewErrorList value:false.
 outStream nextPutLineBlock:(self getOutBlock).
 ^ outStream
 !
 makeProcessFor:aBlock
 self makeProcessFor:aBlock with:''
 !
 makeProcessFor:aBlock with:string
-| locBlock |
 process notNil ifTrue:[
 process waitUntilTerminated.
 terminateByMe ifTrue:[
 terminateByMe := false.
 ^ self
 ].
 ].
-locBlock := [   [
-self notify:string.
+process := [   [
-aBlock value.
+self notify:string.
-self notify:''.
+aBlock value.
+self notify:''.
 ] valueNowOrOnUnwindDo:[
 process := nil.
 self enableStopButton value:false.
 ]
-].
+] newProcess.
-process := locBlock newProcess.
 process priority:(Processor systemBackgroundPriority).
 process name:'ArchiveApplicationProcess'.
+process resume.
 self enableStopButton value:true.
-process resume.
 !
 setColumnsForArchiver
 | newColumns archiverColumns allColumns iconColumn|
 ^ dir
 ! !
 !FileApplicationNoteBook::ArchiveViewApplication methodsFor:'commands add'!
-addFilesToArchiv:colOfFiles
+addFilesToArchive:colOfFiles
+self archiver
+outStream:nil
-self archiver outStream:nil errorStream:(self getErrorStream) synchron:true.
+errorStream:(self getErrorStream)
-self makeProcessFor:[
+synchron:true.
-self archiver addFilesToArchiv:colOfFiles.
-] with:'add Files to archiv'.
+self
+makeProcessFor:[ self archiver addFilesToArchive:colOfFiles ]
+with:'Adding files to archive'.
+"/ ugly code alarm.
 (self archiver class == Archiver zipArchive) ifTrue:[
-self listAllFilesFromArchiv.
+self listAllFilesFromArchive
 ] ifFalse:[
-self listFilesFromArchiv:colOfFiles.
+self listFilesFromArchive:colOfFiles
 ].
-^ true.
+^ true
 ! !
 !FileApplicationNoteBook::ArchiveViewApplication methodsFor:'commands extract'!
 extractAll
 !FileApplicationNoteBook::ArchiveViewApplication methodsFor:'commands extract private'!
 extractAllTo:aDirectory
-self archiver outStream:nil errorStream:(self getErrorStream) synchron:true.
+self archiver
-self makeProcessFor:[
+outStream:nil
-self archiver extractTo:aDirectory.
+errorStream:(self getErrorStream)
-] with:'extract all files'.
+synchron:true.
+self
+makeProcessFor:[ self archiver extractTo:aDirectory ]
+with:'Extracting all files'.
 ^ true.
 !
 extractSelectionTo:aDirectory askForExtractOptions:askForExtractOptionsBoolean
 ^ true
 !
 extractWithDirectoryPartTo:aDirectory with:extractFiles
-self archiver outStream:nil errorStream:(self getErrorStream) synchron:true.
+self archiver
-self makeProcessFor:[
+outStream:nil
-self archiver extractTo:aDirectory with:extractFiles.
+errorStream:(self getErrorStream)
-] with:('extract Files to ', aDirectory asString).
+synchron:true.
+self
+makeProcessFor:[ self archiver extractTo:aDirectory with:extractFiles ]
+with:('Extracting files to %1' bindWith:aDirectory asString).
 ^ true.
 !
 extractWithOutDirectoryPartTo:aDirectory with:extractFiles
-self archiver outStream:nil errorStream:(self getErrorStream) synchron:true.
+self archiver
-self makeProcessFor:[
+outStream:nil
-self archiver extractWithOutDirectoryTo:aDirectory
+errorStream:(self getErrorStream)
-with:(extractFiles collect:[:item| item fileName]).
+synchron:true.
-] with:('extract Files to ', aDirectory asString).
+self
+makeProcessFor:[
+self archiver
+extractWithOutDirectoryTo:aDirectory
+with:(extractFiles collect:[:item| item fileName]).
+]
+with:('Extracting files to %1' bindWith:aDirectory asString).
 ^ true.
 ! !
 !FileApplicationNoteBook::ArchiveViewApplication methodsFor:'commands list'!
-listAllFilesFromArchiv
+listAllFilesFromArchive
 self archiveFileList value removeAll.
-self listFilesFromArchiv:nil
+self listFilesFromArchive:nil
 !
-listFilesFromArchiv:newColOfFiles
+listFilesFromArchive:newColOfFiles
 process notNil ifTrue:[
-process waitUntilTerminated.
+process waitUntilTerminated
 ].
-self archiver outStream:(self getOutStream) errorStream:(self getErrorStream) synchron:true.
-self makeProcessFor:[
+self archiver
-self archiver listFilesFromArchiv:newColOfFiles.
+outStream:(self getOutStream)
-] with:'list Files'.
+errorStream:(self getErrorStream)
+synchron:true.
+self
+makeProcessFor:[self archiver listFilesFromArchive:newColOfFiles]
+with:'List files'
 ! !
 !FileApplicationNoteBook::ArchiveViewApplication methodsFor:'commands remove'!
-removeFilesFromArchiv
+removeFilesFromArchive
+|sel realSel list firtsPre stringCol stringRealSel|
-| sel realSel list firtsPre stringCol stringRealSel|
 sel := self selectionHolder value.
-stringCol := sel collect:[: item| item fileName].
+stringCol := sel collect:[:item | item fileName].
 firtsPre := stringCol at:1.
-stringCol from:2 do:[:el|
+stringCol from:2 do:[:el | firtsPre := firtsPre commonPrefixWith:el].
-firtsPre :=  firtsPre commonPrefixWith:el.
-].
 list := self archiveFileList value.
-realSel := OrderedCollection new.
+"/    realSel := OrderedCollection new.
-list do:[:item|
+"/    list do:[:item |
-((item fileName) startsWith:firtsPre) ifTrue:[
+"/        ((item fileName) startsWith:firtsPre) ifTrue:[
-realSel add:item.
+"/            realSel add:item
-].
+"/        ]
-].
+"/    ].
-stringRealSel := realSel collect:[: item| item fileName].
+realSel := list select:[:item | (item fileName) startsWith:firtsPre].
+stringRealSel := realSel collect:[:item | item fileName].
-self archiver outStream:nil errorStream:(self getErrorStream) synchron:true.
-self makeProcessFor:[
+self archiver
-self archiver removeFilesFromArchiv:stringCol.
+outStream:nil
-] with:'remove files'.
+errorStream:(self getErrorStream)
+synchron:true.
+self
+makeProcessFor:[ self archiver removeFilesFromArchive:stringCol ]
+with:'Remove files'.
 self archiveFileList value removeAllFoundIn:realSel
 ! !
 !FileApplicationNoteBook::ArchiveViewApplication methodsFor:'drag & drop'!
 canDrop:aContext
 ^ inDropMode
 !
 doDrop:aContext
 |col source arg objects|
 source := aContext dropSource.
 arg := source argument.
 objects := aContext dropObjects.
-col := OrderedCollection new.
+col := objects collect:[:dropObject | dropObject theObject].
-objects do:[:obj|
+^ self addFilesToArchive:col
-col add:(obj theObject).
-].
-^ self addFilesToArchiv:col.
 !
 doStartDrag:aDropSource in:aView
 "set the cursors before starting the drag & drop operation
 "
 ^ ret
 ! !
 !FileApplicationNoteBook::ArchiveViewApplication methodsFor:'event handling'!
 processEvent:anEvent
 "filter keyboard events.
 Return true, if I have eaten the event"
 |focusView key rawKey|
 anEvent isKeyPressEvent ifTrue:[
 focusView := anEvent targetView.
 key := anEvent key.
 rawKey := anEvent rawKey.
 (focusView isSameOrComponentOf:self window) ifTrue:[
-"/            (key ~= #'Alt_L') ifTrue:[self halt.].
 (key == #Delete) ifTrue:[
-self removeFilesFromArchiv.
+self removeFilesFromArchive.
 ^ true
-].
+]
 ]
 ].
 ^ false
 ! !
 "/        fileTable registerImage:anIcon key:aKey.
 "/    ].
 self columnDescriptors:(self class tableColumns).
 !
 postOpenWith:aBuilder
+|currentDir contents suffix fileName file archivItem|
-| currentDir contents suffix fileName file archivItem|
 self windowGroup addPreEventHook:self.
 self masterApplication isNil ifTrue:[
 self masterApplication:nil.
 currentDir := Filename homeDirectory.
 contents := currentDir directoryContents.
-fileName := contents detect:[: file |
+fileName := contents
-suffix := file asFilename suffix asLowercase.
+detect:[:file |
-suffix = 'tgz'
+suffix := file asFilename suffix asLowercase.
-] ifNone:[nil].
+suffix = 'tgz'
-fileName isNil ifTrue:[
+]
-Dialog warn:'cant find a Zip file in ', currentDir asString.
+ifNone:[nil].
+fileName isNil ifTrue:[
+Dialog warn:'cant find a Zip file in ' , currentDir asString.
 ^ self
 ].
 file := currentDir construct:fileName.
 archivItem := DirectoryContentsBrowser itemClass fileName:file.
 (self item:archivItem) ifFalse:[
-Dialog warn:'file type of ', item fileName asString, ' not supported'.
+Dialog warn:'file type of ' , item fileName asString , ' not supported'.
-^ self.
+^ self
-].
+]
 ].
-self listAllFilesFromArchiv.
+self listAllFilesFromArchive.
-^ super postOpenWith:aBuilder.
+^ super postOpenWith:aBuilder
 !
 release
 self archiver release.
 ].
 self enableReload value:((modified or:[outDated]) and:[removed not]).
 !
 update:something with:aParameter from:changedObject
-"Invoked when an object that I depend upon sends a change notification."
-"stub code automatically generated - please change as required"
 |modified itemRem contMd5CheckSum viewModified p|
 changedObject == self viewModifiedChannel ifTrue:[
 viewModified := changedObject value.
 self hasMD5 ifTrue:[
 self viewModifiedChannel value:false withoutNotifying:self.
 ! !
 !FileApplicationNoteBook class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libtool/FileApplicationNoteBook.st,v 1.75 2003-04-02 22:40:16 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/FileApplicationNoteBook.st,v 1.76 2003-04-08 16:32:06 cg Exp $'
 ! !

changeset 4803	9224c562e352
parent 4774	5119967dbd89
child 4855	c113852ec9ba