hg/stx-libwidg2: comparison HierarchicalFileList.st

equal deleted inserted replaced

-:173a07117f56
+:1f90c55c4f78
 	poolDictionaries:''
 	privateIn:HierarchicalFileList
 !
 HierarchicalFileList::HierarchicalFileItem subclass:#Directory
-	instanceVariableNames:'modificationTime fetchOperation makeIconGray'
+	instanceVariableNames:'modificationTime makeIconGray quickChildrenInfo'
-	classVariableNames:''
+	classVariableNames:'StateUnknown StateHasChildren StateHasNoChildren StateFetching'
 	poolDictionaries:''
 	privateIn:HierarchicalFileList
 !
 HierarchicalFileList::Directory subclass:#RemoteDirectory
 changeToParent ifTrue:[
 index := children findFirst:[:el| el fileName = oldDir ].
 index ~~ 0 ifTrue:[ newRoot at:index put:oldRoot ].
 ].
-doExpand ifTrue:[ newRoot expand ].
+doExpand ifTrue:[ newRoot enforcedExpand ].
 !
 root:aRoot
 "stop update-task
 "
 and:[indicatorList size ~~ 0]      "/ nothing to do
 ) ifTrue:[
 item := indicatorList removeFirst.
 (self includesIdentical:item) ifFalse:[
-"/ no longer visible
+"/ item is no longer visible
 item resetFetchIndicator.
 item := nil
 ]
 ] ifFalse:[
 item := indicatorTask := task := nil
 #hasChildren    registered in list to be updated for indication
 #hasNoChildren  has children but children list might be nil (remote)
 "
 ! !
+!HierarchicalFileList::Directory class methodsFor:'initialization'!
+initialize
+StateUnknown := nil.
+StateHasChildren := #hasChildren.
+StateHasNoChildren := #hasNoChildren.
+StateFetching := #fetching
+"
+self initialize
+"
+! !
 !HierarchicalFileList::Directory methodsFor:'accessing'!
 children
 "returns the list of children
 "
 children isNil ifTrue:[ self readChildren ].
 ].
 ^ children
 !
-flushChildren
-"flush the children because node not visible ....
-"
-children notNil ifTrue:[
-"keep hasChildren information
-"
-children size ~~ 0 ifTrue:[ fetchOperation := #hasChildren ]
-ifFalse:[ fetchOperation := #hasNoChildren ].
-children := nil.
-].
-!
 icon
-"returns the icon key
+"returns the icon
 "
+|nameKey|
 isExpanded ifTrue:[
+(makeIconGray == true) ifTrue:[
+nameKey := #directoryOpenGray
+] ifFalse:[
+nameKey := #directoryOpen
+]
+] ifFalse:[
 makeIconGray == true ifTrue:[
-^ FileBrowser iconForKeyMatching:#directoryOpenGray
+nameKey := #directoryGray
-].
+]
-^ FileBrowser iconForKeyMatching:#directoryOpen
+].
-].
-makeIconGray == true ifTrue:[
+nameKey notNil ifTrue:[
-^ FileBrowser iconForKeyMatching:#directoryGray
+^ FileBrowser iconForKeyMatching:nameKey
 ].
 icon isNil ifTrue:[
 ^ super icon
 ].
 ^ icon
 !
 ].
 ^ contentsItem fileName baseName
 !
 makeIconGray:something
-"set the value of the instance variable 'makeIconGray' (automatically generated)"
+"set/clear the flag which enforces the icon to be shown in grey"
 makeIconGray := something.
 !
 modificationTime:something
 readChildren
 "reads the list of children
 "
 |model list hadChildren hasChildren|
+self forgetAboutChildren.
 model := self model.
 model isNil ifTrue:[
 "/ must reread later
-fetchOperation := modificationTime := children := nil.
+modificationTime := children := nil.
 ^ nil
 ].
 hadChildren := children size ~~ 0.
 "/ set to suppress reading of children
 children := #().
-fetchOperation   := nil.
 modificationTime := self fileName modificationTime.
 model stopIndicatorValidationFor:self.
 list := model childrenFor:self.
 !HierarchicalFileList::Directory methodsFor:'fetching'!
 basicFetchIndicator
 |hasChildren|
-hasChildren := DirectoryContents directoryNamed:self fileName detect:(self model matchBlock).
+hasChildren := DirectoryContents directoryNamed:(self fileName) detect:(self model matchBlock).
-hasChildren ifTrue:[
+self knownToHaveChildren:hasChildren.
-fetchOperation := #hasChildren
+children notNil ifTrue:[self halt].
-] ifFalse:[
-fetchOperation := #hasNoChildren
-].
 children isNil ifTrue:[
 "setup modification time to suppress monitorCycle
 "
 modificationTime := self fileName modificationTime.
 ].
 !
 fetchIndicator
-"fetch the indicator value which indicates whether children exists or not
+"fetch the indicator value which indicates whether children exist or not.
-called by the list
+Called by the lists update process.
 "
 children notNil ifTrue:[
 "/ children already read
-fetchOperation := nil.
+self forgetAboutChildren.
-^ self
-].
-fetchOperation ~~ #fetching ifTrue:[
-"/ children will be updated ....
 ^ self
 ].
+self isFetchingChildrenInfo ifFalse:[
+"/ children will be updated in a second....
+^ self
+].
 "/ suppress restart of fetchIndicator
 self basicFetchIndicator.
+children notNil ifTrue:[self halt].
 children notNil ifTrue:[
-fetchOperation := nil.
+self forgetAboutChildren.
 children notEmpty ifTrue:[ self changed:#redraw ].
 ] ifFalse:[
 "/ is a remote or very slow file system
-fetchOperation == #hasChildren ifTrue:[
+self isKnownToHaveChildren ifTrue:[
 self changed:#redraw
 ].
 ].
 !
 resetFetchIndicator
 "update indication cycle has deregistered the item
 "
-fetchOperation := nil.
+self forgetAboutChildren.
+! !
+!HierarchicalFileList::Directory methodsFor:'private'!
+flushChildren
+"flush the children because the node is going to be invisible.
+"
+children notNil ifTrue:[
+self knownToHaveChildren:(children size ~~ 0).
+children := nil.
+].
+! !
+!HierarchicalFileList::Directory methodsFor:'private - quick children info'!
+forgetAboutChildren
+quickChildrenInfo := StateUnknown
+!
+isChildrenInfoValid
+^ quickChildrenInfo ~~ StateUnknown and:[quickChildrenInfo ~~ StateFetching]
+!
+isFetchingChildrenInfo
+^ quickChildrenInfo == StateFetching
+!
+isKnownToHaveChildren
+^ quickChildrenInfo == StateHasChildren
+!
+isKnownToHaveNoChildren
+^ quickChildrenInfo == StateHasNoChildren
+!
+knownToHaveChildren:aBoolean
+aBoolean ifTrue:[
+quickChildrenInfo := StateHasChildren.
+] ifFalse:[
+quickChildrenInfo := StateHasNoChildren.
+].
+!
+setFetchingChildrenInfo
+quickChildrenInfo := StateFetching
 ! !
 !HierarchicalFileList::Directory methodsFor:'queries'!
+canExpand
+super canExpand ifTrue:[^ true].
+"/ in case we are fetching the subdirectory
+self isFetchingChildrenInfo ifTrue:[
+self halt.
+].
+^ false
+!
 hasChildren
-"returns true if children exists
+"returns true if children exist
 "
 |model|
 children notNil ifTrue:[
-fetchOperation := nil.
+self forgetAboutChildren.
 ^ children size ~~ 0
 ].
-fetchOperation notNil ifTrue:[
+self isFetchingChildrenInfo ifTrue:[
-^ fetchOperation == #hasChildren
+^ false.
+].
+self isChildrenInfoValid ifTrue:[
+^ self isKnownToHaveChildren
 ].
 model := self model.
 model notNil ifTrue:[
-fetchOperation := #fetching.
+self setFetchingChildrenInfo.
 model startIndicatorValidationFor:self.
 ] ifFalse:[
 self error:'should not happen' mayProceed:true.
-fetchOperation := nil
+self forgetAboutChildren
 ].
-^ children size ~~ 0
+children size ~~ 0 ifTrue:[self halt. ^ true].
+^ false
 !
 isDirectory
 "always returns true
 "
 !HierarchicalFileList::Directory methodsFor:'validation'!
 invalidateRepairNow:doRepair
 "invalidate contents
 "
-fetchOperation := modificationTime := nil.
+modificationTime := nil.
+self forgetAboutChildren
 isExpanded ifFalse:[
 children := nil
 ] ifTrue:[
 doRepair ifTrue:[
 "called if the matchBlock changed
 "
 modificationTime := nil.
 isExpanded ifFalse:[
-fetchOperation := children := nil.
+children := nil.
+self forgetAboutChildren
 ] ifTrue:[
 self monitoringCycle.
 children size ~~ 0 ifTrue:[
 children do:[:aChild| aChild matchBlockChanged ]
 children notNil ifTrue:[
 timeChanged ifFalse:[
 ^ self
 ].
 ].
 DirectoryContents flushCachedDirectoryFor:(self fileName).
 isExpanded ifFalse:[
 timeChanged ifTrue:[
-fetchOperation := children := nil.
+children := nil.
+self forgetAboutChildren.
 self changed:#redraw.
 ].
 ^ self
 ].
+children isNil ifTrue:[ children := #() ].         "/ disable update during merge
+self forgetAboutChildren.
 model := self model.
-children isNil ifTrue:[ children := #() ].         "/ disable update during merge
+mergedList := model childrenFor:self.
-fetchOperation := nil.
-mergedList     := model childrenFor:self.
 mergedList size == 0 ifTrue:[
 self removeAll.
 ^ self
 ].
 size := children size.
 size == 0 ifTrue:[
 self addAll:mergedList.
 ^ self
 ].
 hasChildren
 "returns true if children exists
 "
 children notNil ifTrue:[
-fetchOperation := nil.
+self forgetAboutChildren.
 ^ children size ~~ 0
 ].
-fetchOperation := #hasChildren.
-^ true
+"/ assume that there are children;
+"/ this might be wrong and clicking on the expand-icon
+"/ will then not perform an expand, but remove the can-expand indicator.
+self knownToHaveChildren:true.
+^ true
 !
 isRemoteDirectory
 ^ true
 ! !
 !HierarchicalFileList class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalFileList.st,v 1.43 2003-03-03 10:21:56 penk Exp $'
+^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalFileList.st,v 1.44 2003-04-08 13:38:08 cg Exp $'
 ! !
+HierarchicalFileList::Directory initialize!

changeset 2475	1f90c55c4f78
parent 2457	d1505cba8e39
child 2479	82e797682bf9