hg/stx-libtool2: comparison DirectoryView.st

equal deleted inserted replaced

-:bbe9cdf5dac4
+:9f6c2575f2b1
 ! !
 !DirectoryView methodsFor:'private'!
 readDirectory
+|allDirectories allFiles foundFiles filterList dir newContents|
-|allFiles foundFiles filterList dir|
+allFiles := OrderedCollection new.
-allFiles := Set new.
+allDirectories := OrderedCollection new.
-foundFiles := Set new.
+foundFiles := OrderedCollection new.
 "/ filterList := self listOfFileFilters value.
 filterList := self selectedFileFilter asCollectionOfSubstringsSeparatedBy:$;.
 filterList := filterList collect:[:pattern | pattern withoutSeparators].
 self withCursor:Cursor read do:[
 "/                    ].
 "/                ].
 "/            ].
 dir filesAndBasenamesDo:[:file :name|
 allFiles add: name
+].
+dir directoriesAndBasenamesDo:[:file :name|
+allDirectories add: name
 ].
 Filename isCaseSensitive ifFalse:[
 filterList do:[:filter|
 |lcFilter|
 select:[:name | filter match:name]
 ).
 ]
 ].
-foundFiles := foundFiles asOrderedCollection sort.
+foundFiles sort.
+allDirectories sort.
 dir := directory asFilename.
-self listOfFiles contents: (foundFiles collect:[:name| FileRow new fileName:(dir construct:name)])
+newContents := OrderedCollection new.
+newContents addAll:(allDirectories collect:[:name| FileRow new fileName:(dir construct:name)]).
+newContents addAll:(foundFiles collect:[:name| FileRow new fileName:(dir construct:name)]).
+self listOfFiles contents:newContents
 ]
 ]
 "Modified: / 23.9.1998 / 17:00:42 / cg"
 !