--- a/FileBrowser.st Tue Dec 05 14:38:24 1995 +0100
+++ b/FileBrowser.st Tue Dec 05 16:57:07 1995 +0100
@@ -12,12 +12,12 @@
StandardSystemView subclass:#FileBrowser
instanceVariableNames:'labelView filterField fileListView subView currentDirectory
- fileList checkBlock checkDelta timeOfLastCheck showLongList
- showVeryLongList showDotFiles myName killButton compressTabs
- lockUpdate previousDirectory currentFileName timeOfFileRead
- tabSpec commandView commandIndex'
+ fileList checkBlock checkDelta timeOfLastCheck showLongList
+ showVeryLongList showDotFiles myName killButton compressTabs
+ lockUpdate previousDirectory currentFileName timeOfFileRead
+ tabSpec commandView commandIndex'
classVariableNames:'DirectoryHistory DirectoryHistoryWhere HistorySize DefaultIcon
- CommandHistory CommandHistorySize'
+ CommandHistory CommandHistorySize'
poolDictionaries:''
category:'Interface-Browsers'
!
@@ -197,55 +197,54 @@
|aStream here oldPath wasLazy|
self selectedFilesDo:[:fileName |
- ((currentDirectory typeOf:fileName) == #regular) ifTrue:[
- here := currentDirectory pathName.
+ ((currentDirectory typeOf:fileName) == #regular) ifTrue:[
+ here := currentDirectory pathName.
- ((fileName endsWith:'.o')
- or:[(fileName endsWith:'.so')
- or:[fileName endsWith:'.obj']]) ifTrue:[
- Object abortSignal catch:[
- |p|
+ ((fileName endsWith:'.o')
+ or:[(fileName endsWith:'.so')
+ or:[fileName endsWith:'.obj']]) ifTrue:[
+ Object abortSignal catch:[
+ |p|
- p := (here , '/' ,fileName).
- "/
- "/ look if already loaded ... then unload first
- "/
- (ObjectFileLoader loadedObjectFiles includes:p) ifTrue:[
- (Dialog confirm:(resources
- string:'%1 is already loaded; load anyway ?'
- with:p)) ifFalse:[
- ^ self
- ].
- Transcript showCr:'unloading old ' , p , ' ...'.
- ObjectFileLoader unloadObjectFile:p.
- ].
+ p := (here , '/' ,fileName).
+ "/
+ "/ look if already loaded ... then unload first
+ "/
+ (ObjectFileLoader loadedObjectFiles includes:p) ifTrue:[
+ (Dialog confirm:(resources
+ string:'%1 is already loaded; load anyway ?'
+ with:p)) ifFalse:[
+ ^ self
+ ].
+ Transcript showCr:'unloading old ' , p , ' ...'.
+ ObjectFileLoader unloadObjectFile:p.
+ ].
- Transcript showCr:'loading ' , p , ' ...'.
- ObjectFileLoader loadObjectFile:p.
- Class addInfoRecord:('fileIn ' , fileName)
- ]
- ] ifFalse:[
- aStream := FileStream readonlyFileNamed:fileName in:currentDirectory.
- aStream isNil ifFalse:[
- [
- Class withoutUpdatingChangesDo:[
- oldPath := Smalltalk systemPath.
- Smalltalk systemPath:(oldPath copy addFirst:here; yourself).
- wasLazy := Compiler compileLazy:lazy.
- aStream fileIn.
- ].
- Class addInfoRecord:('fileIn ' , fileName)
- ] valueNowOrOnUnwindDo:[
- Compiler compileLazy:wasLazy.
- Smalltalk systemPath:oldPath.
- aStream close
- ]
- ]
- ]
- ]
+ Transcript showCr:'loading ' , p , ' ...'.
+ ObjectFileLoader loadObjectFile:p.
+ Class addInfoRecord:('fileIn ' , fileName)
+ ]
+ ] ifFalse:[
+ aStream := FileStream readonlyFileNamed:fileName in:currentDirectory.
+ aStream isNil ifFalse:[
+ [
+ Class withoutUpdatingChangesDo:[
+ oldPath := Smalltalk systemPath.
+ Smalltalk systemPath:(oldPath copy addFirst:here; yourself).
+ wasLazy := Compiler compileLazy:lazy.
+ aStream fileIn.
+ ].
+ Class addInfoRecord:('fileIn ' , fileName)
+ ] valueNowOrOnUnwindDo:[
+ Compiler compileLazy:wasLazy.
+ Smalltalk systemPath:oldPath.
+ aStream close
+ ]
+ ]
+ ]
+ ]
]
- "Created: 15.11.1995 / 12:48:51 / cg"
"Modified: 15.11.1995 / 12:49:57 / cg"
!
@@ -2296,4 +2295,4 @@
!FileBrowser class methodsFor:'documentation'!
version
-^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.56 1995-11-23 17:52:52 cg Exp $'! !
+^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.57 1995-12-05 15:57:07 cg Exp $'! !