diff -r d6b039e5916c -r 6beb56becd84 AbstractFileBrowser.st --- a/AbstractFileBrowser.st Wed Oct 28 15:26:37 2009 +0100 +++ b/AbstractFileBrowser.st Wed Oct 28 16:11:22 2009 +0100 @@ -3129,6 +3129,9 @@ ! makeFilterBlock + "return a two-arg filterblock on the files path- and base-name. This block should return true for files + to be shown" + | filterString filterStrings filters showHidden yesOrNo filterBlock ignoreCase| filterString := self filterModel value. @@ -3148,23 +3151,24 @@ pattern := pattern copyFrom:2. ]. yesOrNo ifTrue:[ - [:name | pattern match:name ignoreCase:ignoreCase ] + [:name :baseName | pattern match:baseName ignoreCase:ignoreCase ] ] ifFalse:[ - [:name | (pattern match:name ignoreCase:ignoreCase) not ] + [:name :baseName | (pattern match:baseName ignoreCase:ignoreCase) not ] ]. ]. filters size == 1 ifTrue:[ filterBlock := filters first ] ifFalse:[ - filterBlock := [: name | filters contains:[:aFilter | aFilter value:name ]]. + filterBlock := [:name :baseName | filters contains:[:aFilter | aFilter value:name value:baseName ]]. ]. showHidden := self showHiddenFiles value. showHidden ifTrue:[ ^ filterBlock. ]. - ^ [: el | ((el asString startsWith:'.') not) and:[filterBlock value:el]]. + ^ [:name :baseName | (baseName includesString:'Andwend')ifTrue:[self halt]. + (name isHidden) not and:[filterBlock value:name value:baseName]]. ! shownFiles @@ -7851,9 +7855,9 @@ !AbstractFileBrowser class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.419 2009-10-20 21:50:18 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.420 2009-10-28 15:11:22 cg Exp $' ! version_CVS - ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.419 2009-10-20 21:50:18 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.420 2009-10-28 15:11:22 cg Exp $' ! !