code cleanup
authorClaus Gittinger <cg@exept.de>
Wed, 28 Oct 2009 16:40:11 +0100
changeset 3831 05c49d4b6f3b
parent 3830 84c0ce168c71
child 3832 602c293b4300
code cleanup
HierarchicalFileList.st
--- a/HierarchicalFileList.st	Wed Oct 28 12:23:31 2009 +0100
+++ b/HierarchicalFileList.st	Wed Oct 28 16:40:11 2009 +0100
@@ -318,9 +318,9 @@
             update ifTrue:[
                 item modificationTime:nil.
             ]. 
-            item monitoringCycle
+            item monitoringCycle.
+            Processor yield.
         ].
-        "/ Processor yield.
         item  := self at:index ifAbsent:nil.
         index := index + 1.
     ].
@@ -342,16 +342,18 @@
         anItem beInAccessible.
     ] ifFalse:[
         contents notEmpty ifTrue:[
-            list  := OrderedCollection new.
             match := self matchBlockFor:anItem.
+            match isNil ifTrue:[
+                list := OrderedCollection withAll:contents.
+            ] ifFalse:[
+                list := OrderedCollection new.
+                contents itemsDo:[:each|
+                    (match value:(each fileName) value:(each isDirectory)) ifTrue:[
+                        list add:(HierarchicalFileItem forContentsItem:each).
+                    ]
+                ].
+            ].
 
-            contents itemsDo:[:each|
-                (    match isNil
-                 or:[match value:(each fileName) value:(each isDirectory)]
-                ) ifTrue:[
-                    list add:(HierarchicalFileItem forContentsItem:each).
-                ]
-            ].
             list notEmpty ifTrue:[
                 list sort:self sortBlock.
                 ^ list
@@ -1401,7 +1403,11 @@
 !HierarchicalFileList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalFileList.st,v 1.72 2008-12-19 17:07:23 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalFileList.st,v 1.73 2009-10-28 15:40:11 cg Exp $'
+!
+
+version_CVS
+    ^ '$Header: /cvs/stx/stx/libwidg2/HierarchicalFileList.st,v 1.73 2009-10-28 15:40:11 cg Exp $'
 ! !
 
 HierarchicalFileList::Directory initialize!