--- a/DirectoryContentsBrowser.st	Wed Oct 16 13:00:28 2002 +0200
+++ b/DirectoryContentsBrowser.st	Wed Oct 16 17:07:50 2002 +0200
@@ -2,13 +2,12 @@
 
 AbstractFileBrowser subclass:#DirectoryContentsBrowser
 	instanceVariableNames:'readDirectoryTask updateDirectoryContentsTask updateColumnsTask
-		updateFromSensorTask modificationTime directory columnDescriptors
-		filterBlock iconIndex fileDescriptionIndex iconExtent
-		tableColumns currentSortOrder previewIndex allItemsList
-		currentItemList wantSelectFiles updateToExternFileHolderLock
-		updateTaskSema inDropMode draggedItem canDropItem viewBrowserMenu
-		updateContentsSelection selectionInFileList contentsBrowser
-		browserItemList sel'
+		modificationTime directory columnDescriptors iconIndex
+		fileDescriptionIndex iconExtent tableColumns currentSortOrder
+		previewIndex allItemsList currentItemList wantSelectFiles
+		updateToExternFileHolderLock updateTaskSema inDropMode
+		draggedItem canDropItem viewBrowserMenu updateContentsSelection
+		selectionInFileList contentsBrowser browserItemList'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Interface-Tools-File'
@@ -822,18 +821,6 @@
     self readDirectoryTaskStart.
 !
 
-filterBlock
-    "return the value of the instance variable 'filterBlock' (automatically generated)"
-
-    ^ filterBlock
-!
-
-filterBlock:something
-    "set the value of the instance variable 'filterBlock' (automatically generated)"
-
-    filterBlock := something.
-!
-
 updateColumnsTask
     "return the value of the instance variable 'updateColumnsTask' (automatically generated)"
 
@@ -1028,7 +1015,7 @@
 !
 
 filterChanged
-    self setDefaultFilter.
+
     self evaluateFilter.
 !
 
@@ -1050,23 +1037,6 @@
     ]
 !
 
-setDefaultFilter
-    | filter |
-
-    filter := self filterModel value.
-    filter = '' ifTrue:[filter := '*'].
-    self filterBlock: [: el | 
-                            (self showHiddenFiles value 
-                                ifFalse:[ 
-                                    (el asString startsWith:'.') not
-                                ]
-                                ifTrue:[
-                                    true
-                                ]
-                            )
-                            and:[filter match:el]].
-!
-
 update:something with:aParameter from:aModel
     "one of my models changed
     "
@@ -1088,7 +1058,7 @@
         ].
         ^ self.
     ].
-    aModel == self filterModel ifTrue:[
+    aModel == self filterBlockHolder ifTrue:[
         self updateToExternFileHolderLock doLocked:[
             self filterChanged.
         ].
@@ -1178,19 +1148,15 @@
 !DirectoryContentsBrowser methodsFor:'directory contents'!
 
 evaluateFilter
-    |filterBlock showDir|
-
-    showDir := self viewDirectoriesInDirectoryContentsBrowser value.
+    |filterBlock |
+
 
     currentItemList := OrderedCollection new.
     allItemsList size ~~ 0 ifTrue:[ 
-        filterBlock := self filterBlock.
+        filterBlock := self filterBlockHolder value.
         allItemsList do:[:aItem | 
-            (showDir or:[aItem isDirectory not]) ifTrue:[
-                (filterBlock isNil 
-                or:[filterBlock value:aItem baseName]) ifTrue:[
-                    currentItemList add:aItem 
-                ]
+            (aItem isDirectory or:[filterBlock value:aItem baseName]) ifTrue:[
+                currentItemList add:aItem 
             ]
         ].
     ].
@@ -1626,9 +1592,8 @@
     super makeDependent.
     self currentFileNameHolder addDependent:self.
     self viewDirectoriesInDirectoryContentsBrowser addDependent:self.
-    self filterModel addDependent:self.
+    self filterBlockHolder addDependent:self.
     self sortBlockHolder addDependent:self.
-    self sortBlockProperty addDependent:self.
     self viewDescription onChangeSend:#viewedColumnsChanged to:self.
     self viewDetails onChangeSend:#viewedColumnsChanged to:self.
     self viewGroup onChangeSend:#viewedColumnsChanged to:self.
@@ -1638,7 +1603,6 @@
     self viewSize onChangeSend:#viewedColumnsChanged to:self.
     self viewTime onChangeSend:#viewedColumnsChanged to:self.
     self viewType onChangeSend:#viewedColumnsChanged to:self.
-    self showHiddenFiles onChangeSend:#filterChanged to:self.
 !
 
 postBuildBrowser:aWidget
@@ -1655,7 +1619,7 @@
 postBuildWith:aBuilder
 
     self viewedColumnsChanged.
-    self setDefaultFilter. "/ filterChanged.
+    self filterChanged. "/ filterChanged.
     ^ super postBuildWith:aBuilder.
 !
 
@@ -2584,5 +2548,5 @@
 !DirectoryContentsBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.25 2002-10-16 10:45:00 penk Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.26 2002-10-16 15:07:06 penk Exp $'
 ! !