hg/stx-libwidg2: comparison FileSelectionItem.st

equal deleted inserted replaced

-:14dc9f6791d2
+:465a6c941877
 |path|
 path := aPathname asString.
 (path size > 1 and:[path endsWith:(Filename separator)]) ifTrue:[
-^ (path copyWithout:1) asFilename.
+^ (path copyWithoutLast:1) asFilename.
 ].
 ^ aPathname asFilename
+"Modified: / 24.9.1998 / 15:33:50 / cg"
 ! !
 !FileSelectionItem class methodsFor:'default icons'!
 keysAndIcons
 pathName:aPathname
 "initialze attributes associated with the full pathname, aPathname
 "
 |file|
-file := self class asFilename:aPathname.
+"/    file := self class asFilename:aPathname.
-self fileName:file baseName:(file baseName) parent:nil isDirectory:(file isDirectory)
+file := aPathname asFilename pathName asFilename.
+self
+fileName:file
+baseName:(file baseName)
+parent:nil
+isDirectory:(file isDirectory)
+"Modified: / 24.9.1998 / 16:02:53 / cg"
 ! !
 !FileSelectionItem methodsFor:'accessing hierarchy'!
 collapse
 self expand
 ! !
 !FileSelectionItem methodsFor:'private'!
-fileName:aFilenname baseName:aBaseName parent:aParent isDirectory:aBool
+childFileName:aFilename baseName:aBaseName parent:aParent isDirectory:aBool matchAction:mA
+"initialze attributes associated with the full pathname, aPathname.
+Same as #fileName:baseName:parent:isDirectory:,
+but used only for children (i.e. no need to check for
+being a rootDirectory).
+"
+|f|
+contents    := aFilename.
+name        := aBaseName.
+parent      := aParent.
+isDirectory := readChildren := aBool.
+isDirectory ifFalse:[
+showIndicator := false
+] ifTrue:[
+showIndicator := nil
+].
+matchAction := mA
+"Modified: / 24.9.1998 / 14:10:38 / cg"
+"Created: / 24.9.1998 / 15:51:58 / cg"
+!
+directoryIsLocked
+^ self imageType == #directoryLocked
+"Created: / 24.9.1998 / 14:22:08 / cg"
+!
+fileName:aFilename baseName:aBaseName parent:aParent isDirectory:aBool
 "initialze attributes associated with the full pathname, aPathname
 "
-contents    := aFilenname.
+|f|
-name        := aBaseName.
+contents    := aFilename.
+(f := aFilename asFilename) isRootDirectory ifTrue:[
+name := f name.
+(name endsWith:Filename separator) ifTrue:[
+name := name copyWithoutLast:1.
+]
+] ifFalse:[
+name        := aBaseName.
+].
 parent      := aParent.
 isDirectory := readChildren := aBool.
 isDirectory ifFalse:[
 showIndicator := false
 matchAction := parent matchAction       "/ same as from parent
 ] ifFalse:[
 self match:nil                          "/ setup matchAction new
 ]
+"Modified: / 24.9.1998 / 16:05:13 / cg"
 !
 matchAction
 "returns my match action
 "
 "returns true if the node is a not empty directory
 "
 |model|
 showIndicator isNil ifTrue:[
-(self imageType == #directoryLocked) ifTrue:[
+self directoryIsLocked ifTrue:[
 showIndicator := readChildren := false.
 ] ifFalse:[
 (model := self model) notNil ifTrue:[
 model startIndicatorValidationFor:self.
 ].
 ^ false
 ]
 ].
 ^ showIndicator
+"Modified: / 24.9.1998 / 14:22:34 / cg"
 !
 showIndicator:aBool
 "indication might change; raise a change notification
 "
 ! !
 !FileSelectionItem methodsFor:'update'!
 imageType
+"return my icon-image type - a symbol"
 |readable|
 imageType isNil ifTrue:[
 readable := contents isReadable.
 isDirectory ifTrue:[
 (readable and:[contents isExecutable]) ifTrue:[
-contents isSymbolicLink ifFalse:[imageType := #directory]
+contents isSymbolicLink
-ifTrue:[imageType := #directoryLink]
+ifFalse:[imageType := #directory]
+ifTrue:[imageType := #directoryLink]
 ] ifFalse:[
 imageType := #directoryLocked
 ]
 ] ifFalse:[
 readable ifFalse:[
 ]
 ]
 ].
 ^ imageType
+"Modified: / 24.9.1998 / 15:47:38 / cg"
 !
 readInChildren
 "read children from directory
 "
 list := OrderedCollection new.
 readChildren  := false.
 showIndicator := false.
-self imageType == #directoryLocked ifFalse:[
+self directoryIsLocked ifFalse:[
 Cursor wait showWhile:[
 directory := DirectoryContents directoryNamed:contents.
 directory isNil ifTrue:[
 self stopIndicatorValidation.
 ] ifFalse:[
 modificationTime := directory modificationTime.
 directory contentsAndBaseNamesDo:[:file :bname :isDir|
 (self isVisibleFile:file isDirectory:isDir baseName:bname) ifTrue:[
-list add:(self class new fileName:file baseName:bname parent:self isDirectory:isDir)
+list add:(self class new
+childFileName:file
+baseName:bname
+parent:self
+isDirectory:isDir
+matchAction:matchAction)
 ]
 ].
 showIndicator := list size ~~ 0.
 ]
 ]
 ].
 ^ list
+"Modified: / 24.9.1998 / 15:52:53 / cg"
 ! !
 !FileSelectionItem::Directory class methodsFor:'documentation'!
 documentation
 ! !
 !FileSelectionItem class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg2/FileSelectionItem.st,v 1.11 1998-05-29 11:01:26 ca Exp $'
+^ '$Header: /cvs/stx/stx/libwidg2/FileSelectionItem.st,v 1.12 1998-09-24 14:50:41 cg Exp $'
 ! !

changeset 1139	465a6c941877
parent 901	0e090a691095
child 1141	6484e896b1df