diff -r 7c94d9cad8b4 -r 5804c23cee35 DirectoryContentsBrowser.st --- a/DirectoryContentsBrowser.st Tue Mar 20 13:14:11 2012 +0100 +++ b/DirectoryContentsBrowser.st Tue Mar 20 13:27:06 2012 +0100 @@ -12,26 +12,26 @@ "{ Package: 'stx:libtool' }" AbstractDirectoryBrowser subclass:#DirectoryContentsBrowser - instanceVariableNames:'modificationTime directory columnDescriptors iconIndex - fileDescriptionIndex iconExtent tableColumns previewIndex - draggedItem viewBrowserMenu updateContentsSelection - selectionInFileList browserItemList matchBlock updateTask - directoryChangeFlag directoryContentsChangeFlag filterChangeFlag - sortBlockChangeFlag isBusy changeSema filteredItems allItems - diskUsageInfo diskUsageUpdateProcess multipleSelect - doubleClickAction updateCycleSemaphore updatingColumns accessLock' - classVariableNames:'Debug' - poolDictionaries:'' - category:'Interface-Tools-File' + instanceVariableNames:'modificationTime directory columnDescriptors iconIndex + fileDescriptionIndex iconExtent tableColumns previewIndex + draggedItem viewBrowserMenu updateContentsSelection + selectionInFileList browserItemList matchBlock updateTask + directoryChangeFlag directoryContentsChangeFlag filterChangeFlag + sortBlockChangeFlag isBusy changeSema filteredItems allItems + diskUsageInfo diskUsageUpdateProcess multipleSelect + doubleClickAction updateCycleSemaphore updatingColumns accessLock' + classVariableNames:'Debug' + poolDictionaries:'' + category:'Interface-Tools-File' ! Object subclass:#DirectoryContentsItem - instanceVariableNames:'fileName fileInfo icon fileType - contentsBrowserChangeModificationTime suffix preview group owner - timeAndDate mimeType iconKey mimeTypeForContents baseName' - classVariableNames:'LastUIDToUserNameMapping LastGIDToGroupNameMapping' - poolDictionaries:'' - privateIn:DirectoryContentsBrowser + instanceVariableNames:'fileName fileInfo icon fileType + contentsBrowserChangeModificationTime suffix preview group owner + timeAndDate mimeType iconKey mimeTypeForContents baseName' + classVariableNames:'LastUIDToUserNameMapping LastGIDToGroupNameMapping' + poolDictionaries:'' + privateIn:DirectoryContentsBrowser ! !DirectoryContentsBrowser class methodsFor:'documentation'! @@ -1528,7 +1528,7 @@ ]. ]. - self directoryChanged. "/ to force update of the numberofshown files. + self directoryContentsChanged. "/ to force update of the numberOfShown files. nextItem notNil ifTrue:[ self enqueueMessage:#value @@ -1539,7 +1539,7 @@ "/ self selectItems:(OrderedCollection with:nextItem). ]. - "Modified: / 20-03-2012 / 12:14:11 / cg" + "Modified: / 20-03-2012 / 13:22:48 / cg" ! viewPreviewChanged @@ -2401,7 +2401,6 @@ self setBrowserItemList:#(). directoryContentsChangeFlag := true. - updatingColumns := true. ^ self. self createItemList. @@ -2414,19 +2413,23 @@ ] ]. - "Modified: / 20-03-2012 / 12:54:37 / cg" + "Modified: / 20-03-2012 / 13:16:25 / cg" ! directoryContentsChanged |oldItems itemsToAdd itemsToRemove newItems newAllItems oldAllItems| directory isNil ifTrue:[^ self]. + + filterChangeFlag := false. + updatingColumns := true. + newAllItems := self readDirectoryItems. - newAllItems size > 150 ifTrue:[ - self createItemList. - ^ self - ]. +"/ newAllItems size > 150 ifTrue:[ +"/ self createItemList. +"/ ^ self +"/ ]. newItems := self evaluateFilter:newAllItems. oldItems := filteredItems copy. @@ -2465,7 +2468,7 @@ arguments:#(). filteredItems := newItems. - "Modified: / 01-05-2011 / 08:24:29 / cg" + "Modified: / 20-03-2012 / 13:22:21 / cg" ! evaluateFilter:anItemsList @@ -3400,9 +3403,9 @@ !DirectoryContentsBrowser class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.244 2012-03-20 12:14:11 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.245 2012-03-20 12:27:06 cg Exp $' ! version_CVS - ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.244 2012-03-20 12:14:11 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.245 2012-03-20 12:27:06 cg Exp $' ! !