--- a/DirectoryContentsBrowser.st Mon Jan 22 11:21:58 2007 +0100
+++ b/DirectoryContentsBrowser.st Tue Jan 23 12:55:41 2007 +0100
@@ -2164,7 +2164,8 @@
- update icon for invisible items by contents
- update file info for invisible items if file info column is shown
- update preview for invisible items if preview column is shown
- - update file info for invisible items if file info column is not shown
+ - update file info for invisible items if file info column is not shown
+ Return true, if more is to be done.
"
|desc mime icon type preview|
@@ -2451,13 +2452,14 @@
!
readDirectoryItems
- | list contents|
+ |list contents itemClass|
list := OrderedCollection new.
(directory notNil and:[directory exists]) ifTrue:[
+ itemClass := DirectoryContentsBrowser itemClass.
contents := DirectoryContents directoryNamed:directory.
contents itemsDo:[:eachItem|
- list add:(DirectoryContentsBrowser itemClass forInfoItem:eachItem).
+ list add:(itemClass forInfoItem:eachItem).
].
].
^ list
@@ -2518,14 +2520,14 @@
timedOut := (changeSema waitWithTimeoutMs:(self class updateTaskCyleTime)) isNil.
self debugMessage:'timedOut:', timedOut asString.
- (self filterChangeFlag
- or:[self sortBlockChangeFlag
- or:[self directoryChangeFlag
- or:[self directoryContentsChangeFlag]]]) ifTrue:[
+"/ (self filterChangeFlag
+"/ or:[self sortBlockChangeFlag
+"/ or:[self directoryChangeFlag
+"/ or:[self directoryContentsChangeFlag]]]) ifTrue:[
accessLock critical:[
self updateWithTimeout:timedOut.
].
- ].
+"/ ].
].
"Modified: / 12-12-2006 / 18:07:42 / cg"
@@ -2533,7 +2535,7 @@
updateWithTimeout:timeOut
-"/ Transcript showCR:'START'.
+"/ Transcript showCR:'START'.
self isBusy:true.
[
self directoryChangeFlag ifTrue:[
@@ -2752,16 +2754,16 @@
!DirectoryContentsBrowser::DirectoryContentsItem class methodsFor:'instance creation'!
fileName:aFilename
-
| instance fileItem|
- instance := self new.
+
aFilename asString = '..' ifTrue:[
+ instance := self new.
instance fileName:aFilename.
^ instance.
].
fileItem := DirectoryContents contentsItemForFileName:aFilename.
- fileItem notNil ifTrue:[^ self forInfoItem:fileItem].
- ^ nil
+ fileItem isNil ifTrue:[^ nil].
+ ^ self forInfoItem:fileItem.
"
DirectoryContentsItem fileName:'..'
@@ -2770,6 +2772,7 @@
forInfoItem:anItem
| instance |
+
instance := self new.
instance fileName:anItem fileName.
anItem isRemoteDirectory ifTrue:[
@@ -3259,5 +3262,5 @@
!DirectoryContentsBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.201 2007-01-12 17:41:22 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.202 2007-01-23 11:55:41 cg Exp $'
! !