Mercurial Mercurial > hg > stx-libtool / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not hide classes in sub-nameSpaces
authorClaus Gittinger <cg@exept.de>
Fri, 06 Jun 2003 19:56:19 +0200
changeset 4951 fb4b8f511536
parent 4950 d0b7db4bfba5
child 4952 ee7a90a3396c
do not hide classes in sub-nameSpaces
NewSystemBrowser.st file | annotate | diff | comparison | revisions
Tools__NewSystemBrowser.st file | annotate | diff | comparison | revisions 
--- a/NewSystemBrowser.st	Wed Jun 04 15:42:38 2003 +0200
+++ b/NewSystemBrowser.st	Fri Jun 06 19:56:19 2003 +0200
@@ -13,245 +13,245 @@
 "{ Package: 'stx:libtool' }"
 
 SystemBrowser subclass:#NewSystemBrowser
-        instanceVariableNames:'navigationState bufferNameList selectedBuffer buffers
-                bufferUsageOrder browserCanvas immediateUpdate showClassPackages
-                lastMethodCategory lastMethodMoveClass browserCanvasType
-                windowLabel syntaxColoringProcessRunning syntaxColoringProcess
-                methodInfoProcess'
-        classVariableNames:'LastNewProtocol LastProtocolRenames LastCategoryRenames
-                LastCategoryRenameOld LastCategoryRenameNew LastProjectMoves
-                LastNameSpaceMove LastMethodMoveOrCopyTargetClass
-                LastSearchPatterns LastGlobalSearched LastClassFilterBlockString
-                LastMethodFilterBlockString LastBreakPointConditionString
-                LastIndividualChecks LastAcceptPackage LastVariableRenames
-                BookMarks FindHistory CheckForInstancesWhenRemovingClasses
-                SynchronousUpdate DefaultIsNewBuffer DoubleClickIsOpenBrowser
-                ShowMethodTemplateWhenProtocolIsSelected
-                DefaultShowMethodTemplate DefaultShowMethodInheritance
-                DefaultEmphasizeUnloadedClasses DefaultImmediateSyntaxColoring
-                DefaultSyntaxColoring DefaultToolBarVisible
-                DefaultCodeInfoVisible LastVisitorClassName
-                DefaultShortNameInTabs DefaultHideUnloadedClasses
-                DefaultMarkApplications'
-        poolDictionaries:''
-        category:'Interface-Browsers'
+	instanceVariableNames:'navigationState bufferNameList selectedBuffer buffers
+		bufferUsageOrder browserCanvas immediateUpdate showClassPackages
+		lastMethodCategory lastMethodMoveClass browserCanvasType
+		windowLabel syntaxColoringProcessRunning syntaxColoringProcess
+		methodInfoProcess'
+	classVariableNames:'LastNewProtocol LastProtocolRenames LastCategoryRenames
+		LastCategoryRenameOld LastCategoryRenameNew LastProjectMoves
+		LastNameSpaceMove LastMethodMoveOrCopyTargetClass
+		LastSearchPatterns LastGlobalSearched LastClassFilterBlockString
+		LastMethodFilterBlockString LastBreakPointConditionString
+		LastIndividualChecks LastAcceptPackage LastVariableRenames
+		BookMarks FindHistory CheckForInstancesWhenRemovingClasses
+		SynchronousUpdate DefaultIsNewBuffer DoubleClickIsOpenBrowser
+		ShowMethodTemplateWhenProtocolIsSelected
+		DefaultShowMethodTemplate DefaultShowMethodInheritance
+		DefaultEmphasizeUnloadedClasses DefaultImmediateSyntaxColoring
+		DefaultSyntaxColoring DefaultToolBarVisible
+		DefaultCodeInfoVisible LastVisitorClassName
+		DefaultShortNameInTabs DefaultHideUnloadedClasses
+		DefaultMarkApplications'
+	poolDictionaries:''
+	category:'Interface-Browsers'
 !
 
 ApplicationModel subclass:#NavigatorModel
-        instanceVariableNames:''
-        classVariableNames:'AllEntry'
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:''
+	classVariableNames:'AllEntry'
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::NavigatorModel subclass:#BrowserList
-        instanceVariableNames:'menuHolder inGeneratorHolder outGeneratorHolder
-                selectionChangeCondition immediateUpdate doubleClickChannel
-                filter updateTrigger forceGeneratorTrigger hideUnloadedClasses
-                showClassPackages selectionHolder packageFilter nameSpaceFilter
-                organizerMode slaveMode listValid pseudoListLabelHolder icons
-                sortBy'
-        classVariableNames:'SynchronousUpdate Icons'
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'menuHolder inGeneratorHolder outGeneratorHolder
+		selectionChangeCondition immediateUpdate doubleClickChannel
+		filter updateTrigger forceGeneratorTrigger hideUnloadedClasses
+		showClassPackages selectionHolder packageFilter nameSpaceFilter
+		organizerMode slaveMode listValid pseudoListLabelHolder icons
+		sortBy'
+	classVariableNames:'SynchronousUpdate Icons'
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 Object subclass:#ClassChecker
-        instanceVariableNames:'checkedClass badClasses badClassInfo badMethods badMethodInfo
-                obsoleteWarners allObsoleteMethods checksPerformed'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'checkedClass badClasses badClassInfo badMethods badMethodInfo
+		obsoleteWarners allObsoleteMethods checksPerformed'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::BrowserList subclass:#ClassGeneratorList
-        instanceVariableNames:'organizerList categoryList namespaceList namespaceNameList
-                projectList selectedCategories selectedNamespaces
-                selectedProjects selectedClasses'
-        classVariableNames:'AdditionalEmptyCategories AdditionalEmptyProjects'
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'organizerList categoryList namespaceList namespaceNameList
+		projectList selectedCategories selectedNamespaces
+		selectedProjects selectedClasses'
+	classVariableNames:'AdditionalEmptyCategories AdditionalEmptyProjects'
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::BrowserList subclass:#ClassList
-        instanceVariableNames:'classList classNameList meta lastSelectedClasses
-                selectedClassNameIndices currentNamespace hidePrivateClasses
-                unloadedClassesColor markApplicationsHolder'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'classList classNameList meta lastSelectedClasses
+		selectedClassNameIndices currentNamespace hidePrivateClasses
+		unloadedClassesColor markApplicationsHolder'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::BrowserList subclass:#MethodCategoryList
-        instanceVariableNames:'variableFilter filterClassVars lastSelectedProtocols classes
-                leafClasses protocolList rawProtocolList selectedProtocolIndices
-                lastGeneratedProtocols noAllItem packageFilterOnInput
-                methodVisibilityHolder'
-        classVariableNames:'AdditionalEmptyCategoriesPerClassName'
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'variableFilter filterClassVars lastSelectedProtocols classes
+		leafClasses protocolList rawProtocolList selectedProtocolIndices
+		lastGeneratedProtocols noAllItem packageFilterOnInput
+		methodVisibilityHolder'
+	classVariableNames:'AdditionalEmptyCategoriesPerClassName'
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::BrowserList subclass:#ClassCategoryList
-        instanceVariableNames:'categoryList classes allSelected'
-        classVariableNames:'AdditionalEmptyCategories'
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'categoryList classes allSelected'
+	classVariableNames:'AdditionalEmptyCategories'
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::ClassList subclass:#HierarchicalClassList
-        instanceVariableNames:'topClassHolder'
-        classVariableNames:'InheritedEntry'
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'topClassHolder'
+	classVariableNames:'InheritedEntry'
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::BrowserList subclass:#ProjectList
-        instanceVariableNames:'projectList'
-        classVariableNames:'AdditionalEmptyProjects'
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'projectList'
+	classVariableNames:'AdditionalEmptyProjects'
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::BrowserList subclass:#MethodList
-        instanceVariableNames:'classes selectedMethodNameIndices methodList lastSelectedMethods
-                browserNameList variableFilter filterClassVars updateProcess
-                lastShowClass lastShowCategory lastShowClassFirst
-                showMethodInheritance lastMethodClass lastMethodClassesSubclasses
-                classAndSelectorsRedefinedBySubclassesOfClass'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'classes selectedMethodNameIndices methodList lastSelectedMethods
+		browserNameList variableFilter filterClassVars updateProcess
+		lastShowClass lastShowCategory lastShowClassFirst
+		showMethodInheritance lastMethodClass lastMethodClassesSubclasses
+		classAndSelectorsRedefinedBySubclassesOfClass'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::MethodList subclass:#ImplementingMethodList
-        instanceVariableNames:'selectorList selectedSelectors'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'selectorList selectedSelectors'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::HierarchicalClassList subclass:#InheritanceClassList
-        instanceVariableNames:''
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::MethodCategoryList subclass:#FullMethodCategoryList
-        instanceVariableNames:''
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::MethodList subclass:#ImplementingClassList
-        instanceVariableNames:''
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::BrowserList subclass:#NamespaceList
-        instanceVariableNames:'namespaceNameList namespaceList'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'namespaceNameList namespaceList'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 Object subclass:#NavigationState
-        instanceVariableNames:'browserLabel codeModifiedHolder categoryList classList
-                packageFilter nameSpaceFilter hidePrivateClasses canvasType
-                notMetaToggle metaToggle metaToggleLabel organizerMode codeAspect
-                codeHolder classDocumentationHolder canvas selectorListGenerator
-                protocolListGenerator classListPerNameSpaceGenerator
-                classListGenerator categoryListGenerator nameSpaceListGenerator
-                projectListGenerator classHierarchyTopClass meta selectedMethods
-                selectedProtocols selectedClasses selectedCategories
-                selectedProjects selectedNamespaces variableFilter
-                filterClassVars sortBy noAllItem autoSearchPattern
-                autoSearchIgnoreCase realModifiedState methodInfo
-                versionDiffApplication selectorListGeneratorArray
-                selectedMethodsArray infoLabelHolder packageLabelHolder
-                cursorLineLabelHolder cursorColLabelHolder'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'browserLabel codeModifiedHolder categoryList classList
+		packageFilter nameSpaceFilter hidePrivateClasses canvasType
+		notMetaToggle metaToggle metaToggleLabel organizerMode codeAspect
+		codeHolder classDocumentationHolder canvas selectorListGenerator
+		protocolListGenerator classListPerNameSpaceGenerator
+		classListGenerator categoryListGenerator nameSpaceListGenerator
+		projectListGenerator classHierarchyTopClass meta selectedMethods
+		selectedProtocols selectedClasses selectedCategories
+		selectedProjects selectedNamespaces variableFilter
+		filterClassVars sortBy noAllItem autoSearchPattern
+		autoSearchIgnoreCase realModifiedState methodInfo
+		versionDiffApplication selectorListGeneratorArray
+		selectedMethodsArray infoLabelHolder packageLabelHolder
+		cursorLineLabelHolder cursorColLabelHolder'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::NavigatorModel subclass:#NavigatorCanvas
-        instanceVariableNames:''
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::ClassCategoryList subclass:#HierarchicalClassCategoryList
-        instanceVariableNames:'hierarchicalCategoryTree hierarchicalCategoryList
-                hierarchicalCategorySelection categoryToItemDictionary'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'hierarchicalCategoryTree hierarchicalCategoryList
+		hierarchicalCategorySelection categoryToItemDictionary'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 HierarchicalItem subclass:#ClassCategoryItem
-        instanceVariableNames:'label category'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser::HierarchicalClassCategoryList
+	instanceVariableNames:'label category'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser::HierarchicalClassCategoryList
 !
 
 NewSystemBrowser::NavigatorModel subclass:#OrganizerCanvas
-        instanceVariableNames:'projectListSlaveMode namespaceListSlaveMode categoryListSlaveMode
-                classInheritanceListSlaveMode classListSlaveMode
-                classHierarchyListSlaveMode organizerMode metaToggle
-                notMetaToggle meta classList classCategoryDoubleClickChannel
-                classDoubleClickChannel classGeneratorHolder
-                classGeneratorHolderFromClassCategory
-                classGeneratorHolderFromClassHierarchy
-                classGeneratorHolderFromProject classGeneratorHolderFromNamespace
-                classCategoryListMenuHolder categoryListShown
-                classCategoryListUpdateTrigger classListUpdateTrigger
-                classListMenuHolder classHierarchyListMenuHolder
-                projectListMenuHolder variablesMenuHolder filterClassVars
-                variableFilter packageFilter nameSpaceFilter hidePrivateClasses
-                hideUnloadedClasses showClassPackages immediateUpdate
-                metaToggleLabelHolder selectedCategories selectedClasses
-                selectedNamespaces selectedProjects selectionChangeCondition
-                nameSpaceFilterSelection markApplicationsHolder'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'projectListSlaveMode namespaceListSlaveMode categoryListSlaveMode
+		classInheritanceListSlaveMode classListSlaveMode
+		classHierarchyListSlaveMode organizerMode metaToggle
+		notMetaToggle meta classList classCategoryDoubleClickChannel
+		classDoubleClickChannel classGeneratorHolder
+		classGeneratorHolderFromClassCategory
+		classGeneratorHolderFromClassHierarchy
+		classGeneratorHolderFromProject classGeneratorHolderFromNamespace
+		classCategoryListMenuHolder categoryListShown
+		classCategoryListUpdateTrigger classListUpdateTrigger
+		classListMenuHolder classHierarchyListMenuHolder
+		projectListMenuHolder variablesMenuHolder filterClassVars
+		variableFilter packageFilter nameSpaceFilter hidePrivateClasses
+		hideUnloadedClasses showClassPackages immediateUpdate
+		metaToggleLabelHolder selectedCategories selectedClasses
+		selectedNamespaces selectedProjects selectionChangeCondition
+		nameSpaceFilterSelection markApplicationsHolder'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::ProjectList subclass:#HierarchicalProjectList
-        instanceVariableNames:'hierarchicalProjectTree selectedProjectItems packageIcon
-                hierarchicalProjectList hierarchicalProjectSelection
-                packageToItemDictionary'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'hierarchicalProjectTree selectedProjectItems packageIcon
+		hierarchicalProjectList hierarchicalProjectSelection
+		packageToItemDictionary'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 HierarchicalItem subclass:#ProjectItem
-        instanceVariableNames:'label packageID'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser::HierarchicalProjectList
+	instanceVariableNames:'label packageID'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser::HierarchicalProjectList
 !
 
 ApplicationModel subclass:#SpecialCodeView
-        instanceVariableNames:'displayMode'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'displayMode'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::BrowserList subclass:#VariableList
-        instanceVariableNames:'variableList classHolder showClassVars'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'variableList classHolder showClassVars'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 !NewSystemBrowser class methodsFor:'documentation'!
@@ -36077,9 +36077,14 @@
 !
 
 isClass:aClass shownWithNameSpaceFilter:nameSpaceFilter
-     nameSpaceFilter isNil ifTrue:[^ true].
-     (nameSpaceFilter includes:aClass topNameSpace name) ifTrue:[^ true].
-     ^ false
+    |nsName|
+
+    nameSpaceFilter isNil ifTrue:[^ true].
+    nsName := aClass topNameSpace name.
+
+    (nameSpaceFilter includes:nsName) ifTrue:[^ true].
+    (nameSpaceFilter contains:[:ns | nsName startsWith:(ns , '::')]) ifTrue:[^ true].
+    ^ false
 !
 
 isClass:aClass shownWithPackageFilter:packageFilter
@@ -43941,16 +43946,16 @@
 makeGenerator
     "return a generator which enumerates the classes from the selected namespace(s)."
 
-    |spaces hideUnloadedClasses|
-
-    spaces := self selectedNamespaces value.
-    spaces size == 0 ifTrue:[
+    |spaceNames hideUnloadedClasses|
+
+    spaceNames := self selectedNamespaces value.
+    spaceNames size == 0 ifTrue:[
         ^ #()
     ].
 
     hideUnloadedClasses := self hideUnloadedClasses value.
 
-    (spaces includes:(self class nameListEntryForALL)) ifTrue:[
+    (spaceNames includes:(self class nameListEntryForALL)) ifTrue:[
         hideUnloadedClasses ifTrue:[
             ^ Iterator on:[:whatToDo |
                                Smalltalk allClassesDo:[:cls |
@@ -43967,8 +43972,8 @@
                       ]
     ].
 
-    (spaces size == 1 
-     and:[spaces first = 'Smalltalk']) ifTrue:[
+    (spaceNames size == 1 
+     and:[spaceNames first = 'Smalltalk']) ifTrue:[
         "/ somewhat tuned - quick look if classes name
         "/ includes colons ...
         ^ Iterator on:[:whatToDo |
@@ -43997,17 +44002,17 @@
 
     ^ Iterator on:[:whatToDo |
                        Smalltalk allClassesDo:[:cls |
-                           |includeIt|
-
-                           includeIt := cls isPrivate not 
-                                        and:[(spaces includes:cls nameSpace name)].
-                           includeIt := includeIt
-                                        or:[(cls isPrivate  
-                                            and:[(spaces includes:cls topOwningClass nameSpace name)])].
-
-                           includeIt := includeIt
-                                        and:[hideUnloadedClasses not
-                                              or:[cls isLoaded]].
+                           |spaceOfClass spaceNameOfClass includeIt|
+
+                           spaceOfClass := cls isPrivate ifTrue:[cls topOwningClass nameSpace] ifFalse:[cls nameSpace].
+                           spaceNameOfClass := spaceOfClass name.
+
+                           includeIt := spaceNames contains:[:nm | nm = spaceNameOfClass
+                                                                   or:[spaceNameOfClass startsWith:(nm , '::')]].
+
+                           hideUnloadedClasses ifTrue:[
+                               includeIt := includeIt and:[cls isLoaded].
+                           ].
                            includeIt ifTrue:[
                                cls isNameSpace ifFalse:[
                                    whatToDo value:cls
@@ -56243,7 +56248,7 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.590 2003-05-26 09:33:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.591 2003-06-06 17:56:19 cg Exp $'
 ! !
 
 NewSystemBrowser initialize!
--- a/Tools__NewSystemBrowser.st	Wed Jun 04 15:42:38 2003 +0200
+++ b/Tools__NewSystemBrowser.st	Fri Jun 06 19:56:19 2003 +0200
@@ -13,245 +13,245 @@
 "{ Package: 'stx:libtool' }"
 
 SystemBrowser subclass:#NewSystemBrowser
-        instanceVariableNames:'navigationState bufferNameList selectedBuffer buffers
-                bufferUsageOrder browserCanvas immediateUpdate showClassPackages
-                lastMethodCategory lastMethodMoveClass browserCanvasType
-                windowLabel syntaxColoringProcessRunning syntaxColoringProcess
-                methodInfoProcess'
-        classVariableNames:'LastNewProtocol LastProtocolRenames LastCategoryRenames
-                LastCategoryRenameOld LastCategoryRenameNew LastProjectMoves
-                LastNameSpaceMove LastMethodMoveOrCopyTargetClass
-                LastSearchPatterns LastGlobalSearched LastClassFilterBlockString
-                LastMethodFilterBlockString LastBreakPointConditionString
-                LastIndividualChecks LastAcceptPackage LastVariableRenames
-                BookMarks FindHistory CheckForInstancesWhenRemovingClasses
-                SynchronousUpdate DefaultIsNewBuffer DoubleClickIsOpenBrowser
-                ShowMethodTemplateWhenProtocolIsSelected
-                DefaultShowMethodTemplate DefaultShowMethodInheritance
-                DefaultEmphasizeUnloadedClasses DefaultImmediateSyntaxColoring
-                DefaultSyntaxColoring DefaultToolBarVisible
-                DefaultCodeInfoVisible LastVisitorClassName
-                DefaultShortNameInTabs DefaultHideUnloadedClasses
-                DefaultMarkApplications'
-        poolDictionaries:''
-        category:'Interface-Browsers'
+	instanceVariableNames:'navigationState bufferNameList selectedBuffer buffers
+		bufferUsageOrder browserCanvas immediateUpdate showClassPackages
+		lastMethodCategory lastMethodMoveClass browserCanvasType
+		windowLabel syntaxColoringProcessRunning syntaxColoringProcess
+		methodInfoProcess'
+	classVariableNames:'LastNewProtocol LastProtocolRenames LastCategoryRenames
+		LastCategoryRenameOld LastCategoryRenameNew LastProjectMoves
+		LastNameSpaceMove LastMethodMoveOrCopyTargetClass
+		LastSearchPatterns LastGlobalSearched LastClassFilterBlockString
+		LastMethodFilterBlockString LastBreakPointConditionString
+		LastIndividualChecks LastAcceptPackage LastVariableRenames
+		BookMarks FindHistory CheckForInstancesWhenRemovingClasses
+		SynchronousUpdate DefaultIsNewBuffer DoubleClickIsOpenBrowser
+		ShowMethodTemplateWhenProtocolIsSelected
+		DefaultShowMethodTemplate DefaultShowMethodInheritance
+		DefaultEmphasizeUnloadedClasses DefaultImmediateSyntaxColoring
+		DefaultSyntaxColoring DefaultToolBarVisible
+		DefaultCodeInfoVisible LastVisitorClassName
+		DefaultShortNameInTabs DefaultHideUnloadedClasses
+		DefaultMarkApplications'
+	poolDictionaries:''
+	category:'Interface-Browsers'
 !
 
 ApplicationModel subclass:#NavigatorModel
-        instanceVariableNames:''
-        classVariableNames:'AllEntry'
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:''
+	classVariableNames:'AllEntry'
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::NavigatorModel subclass:#BrowserList
-        instanceVariableNames:'menuHolder inGeneratorHolder outGeneratorHolder
-                selectionChangeCondition immediateUpdate doubleClickChannel
-                filter updateTrigger forceGeneratorTrigger hideUnloadedClasses
-                showClassPackages selectionHolder packageFilter nameSpaceFilter
-                organizerMode slaveMode listValid pseudoListLabelHolder icons
-                sortBy'
-        classVariableNames:'SynchronousUpdate Icons'
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'menuHolder inGeneratorHolder outGeneratorHolder
+		selectionChangeCondition immediateUpdate doubleClickChannel
+		filter updateTrigger forceGeneratorTrigger hideUnloadedClasses
+		showClassPackages selectionHolder packageFilter nameSpaceFilter
+		organizerMode slaveMode listValid pseudoListLabelHolder icons
+		sortBy'
+	classVariableNames:'SynchronousUpdate Icons'
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 Object subclass:#ClassChecker
-        instanceVariableNames:'checkedClass badClasses badClassInfo badMethods badMethodInfo
-                obsoleteWarners allObsoleteMethods checksPerformed'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'checkedClass badClasses badClassInfo badMethods badMethodInfo
+		obsoleteWarners allObsoleteMethods checksPerformed'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::BrowserList subclass:#ClassGeneratorList
-        instanceVariableNames:'organizerList categoryList namespaceList namespaceNameList
-                projectList selectedCategories selectedNamespaces
-                selectedProjects selectedClasses'
-        classVariableNames:'AdditionalEmptyCategories AdditionalEmptyProjects'
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'organizerList categoryList namespaceList namespaceNameList
+		projectList selectedCategories selectedNamespaces
+		selectedProjects selectedClasses'
+	classVariableNames:'AdditionalEmptyCategories AdditionalEmptyProjects'
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::BrowserList subclass:#ClassList
-        instanceVariableNames:'classList classNameList meta lastSelectedClasses
-                selectedClassNameIndices currentNamespace hidePrivateClasses
-                unloadedClassesColor markApplicationsHolder'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'classList classNameList meta lastSelectedClasses
+		selectedClassNameIndices currentNamespace hidePrivateClasses
+		unloadedClassesColor markApplicationsHolder'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::BrowserList subclass:#MethodCategoryList
-        instanceVariableNames:'variableFilter filterClassVars lastSelectedProtocols classes
-                leafClasses protocolList rawProtocolList selectedProtocolIndices
-                lastGeneratedProtocols noAllItem packageFilterOnInput
-                methodVisibilityHolder'
-        classVariableNames:'AdditionalEmptyCategoriesPerClassName'
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'variableFilter filterClassVars lastSelectedProtocols classes
+		leafClasses protocolList rawProtocolList selectedProtocolIndices
+		lastGeneratedProtocols noAllItem packageFilterOnInput
+		methodVisibilityHolder'
+	classVariableNames:'AdditionalEmptyCategoriesPerClassName'
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::BrowserList subclass:#ClassCategoryList
-        instanceVariableNames:'categoryList classes allSelected'
-        classVariableNames:'AdditionalEmptyCategories'
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'categoryList classes allSelected'
+	classVariableNames:'AdditionalEmptyCategories'
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::ClassList subclass:#HierarchicalClassList
-        instanceVariableNames:'topClassHolder'
-        classVariableNames:'InheritedEntry'
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'topClassHolder'
+	classVariableNames:'InheritedEntry'
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::BrowserList subclass:#ProjectList
-        instanceVariableNames:'projectList'
-        classVariableNames:'AdditionalEmptyProjects'
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'projectList'
+	classVariableNames:'AdditionalEmptyProjects'
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::BrowserList subclass:#MethodList
-        instanceVariableNames:'classes selectedMethodNameIndices methodList lastSelectedMethods
-                browserNameList variableFilter filterClassVars updateProcess
-                lastShowClass lastShowCategory lastShowClassFirst
-                showMethodInheritance lastMethodClass lastMethodClassesSubclasses
-                classAndSelectorsRedefinedBySubclassesOfClass'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'classes selectedMethodNameIndices methodList lastSelectedMethods
+		browserNameList variableFilter filterClassVars updateProcess
+		lastShowClass lastShowCategory lastShowClassFirst
+		showMethodInheritance lastMethodClass lastMethodClassesSubclasses
+		classAndSelectorsRedefinedBySubclassesOfClass'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::MethodList subclass:#ImplementingMethodList
-        instanceVariableNames:'selectorList selectedSelectors'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'selectorList selectedSelectors'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::HierarchicalClassList subclass:#InheritanceClassList
-        instanceVariableNames:''
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::MethodCategoryList subclass:#FullMethodCategoryList
-        instanceVariableNames:''
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::MethodList subclass:#ImplementingClassList
-        instanceVariableNames:''
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::BrowserList subclass:#NamespaceList
-        instanceVariableNames:'namespaceNameList namespaceList'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'namespaceNameList namespaceList'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 Object subclass:#NavigationState
-        instanceVariableNames:'browserLabel codeModifiedHolder categoryList classList
-                packageFilter nameSpaceFilter hidePrivateClasses canvasType
-                notMetaToggle metaToggle metaToggleLabel organizerMode codeAspect
-                codeHolder classDocumentationHolder canvas selectorListGenerator
-                protocolListGenerator classListPerNameSpaceGenerator
-                classListGenerator categoryListGenerator nameSpaceListGenerator
-                projectListGenerator classHierarchyTopClass meta selectedMethods
-                selectedProtocols selectedClasses selectedCategories
-                selectedProjects selectedNamespaces variableFilter
-                filterClassVars sortBy noAllItem autoSearchPattern
-                autoSearchIgnoreCase realModifiedState methodInfo
-                versionDiffApplication selectorListGeneratorArray
-                selectedMethodsArray infoLabelHolder packageLabelHolder
-                cursorLineLabelHolder cursorColLabelHolder'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'browserLabel codeModifiedHolder categoryList classList
+		packageFilter nameSpaceFilter hidePrivateClasses canvasType
+		notMetaToggle metaToggle metaToggleLabel organizerMode codeAspect
+		codeHolder classDocumentationHolder canvas selectorListGenerator
+		protocolListGenerator classListPerNameSpaceGenerator
+		classListGenerator categoryListGenerator nameSpaceListGenerator
+		projectListGenerator classHierarchyTopClass meta selectedMethods
+		selectedProtocols selectedClasses selectedCategories
+		selectedProjects selectedNamespaces variableFilter
+		filterClassVars sortBy noAllItem autoSearchPattern
+		autoSearchIgnoreCase realModifiedState methodInfo
+		versionDiffApplication selectorListGeneratorArray
+		selectedMethodsArray infoLabelHolder packageLabelHolder
+		cursorLineLabelHolder cursorColLabelHolder'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::NavigatorModel subclass:#NavigatorCanvas
-        instanceVariableNames:''
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::ClassCategoryList subclass:#HierarchicalClassCategoryList
-        instanceVariableNames:'hierarchicalCategoryTree hierarchicalCategoryList
-                hierarchicalCategorySelection categoryToItemDictionary'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'hierarchicalCategoryTree hierarchicalCategoryList
+		hierarchicalCategorySelection categoryToItemDictionary'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 HierarchicalItem subclass:#ClassCategoryItem
-        instanceVariableNames:'label category'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser::HierarchicalClassCategoryList
+	instanceVariableNames:'label category'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser::HierarchicalClassCategoryList
 !
 
 NewSystemBrowser::NavigatorModel subclass:#OrganizerCanvas
-        instanceVariableNames:'projectListSlaveMode namespaceListSlaveMode categoryListSlaveMode
-                classInheritanceListSlaveMode classListSlaveMode
-                classHierarchyListSlaveMode organizerMode metaToggle
-                notMetaToggle meta classList classCategoryDoubleClickChannel
-                classDoubleClickChannel classGeneratorHolder
-                classGeneratorHolderFromClassCategory
-                classGeneratorHolderFromClassHierarchy
-                classGeneratorHolderFromProject classGeneratorHolderFromNamespace
-                classCategoryListMenuHolder categoryListShown
-                classCategoryListUpdateTrigger classListUpdateTrigger
-                classListMenuHolder classHierarchyListMenuHolder
-                projectListMenuHolder variablesMenuHolder filterClassVars
-                variableFilter packageFilter nameSpaceFilter hidePrivateClasses
-                hideUnloadedClasses showClassPackages immediateUpdate
-                metaToggleLabelHolder selectedCategories selectedClasses
-                selectedNamespaces selectedProjects selectionChangeCondition
-                nameSpaceFilterSelection markApplicationsHolder'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'projectListSlaveMode namespaceListSlaveMode categoryListSlaveMode
+		classInheritanceListSlaveMode classListSlaveMode
+		classHierarchyListSlaveMode organizerMode metaToggle
+		notMetaToggle meta classList classCategoryDoubleClickChannel
+		classDoubleClickChannel classGeneratorHolder
+		classGeneratorHolderFromClassCategory
+		classGeneratorHolderFromClassHierarchy
+		classGeneratorHolderFromProject classGeneratorHolderFromNamespace
+		classCategoryListMenuHolder categoryListShown
+		classCategoryListUpdateTrigger classListUpdateTrigger
+		classListMenuHolder classHierarchyListMenuHolder
+		projectListMenuHolder variablesMenuHolder filterClassVars
+		variableFilter packageFilter nameSpaceFilter hidePrivateClasses
+		hideUnloadedClasses showClassPackages immediateUpdate
+		metaToggleLabelHolder selectedCategories selectedClasses
+		selectedNamespaces selectedProjects selectionChangeCondition
+		nameSpaceFilterSelection markApplicationsHolder'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::ProjectList subclass:#HierarchicalProjectList
-        instanceVariableNames:'hierarchicalProjectTree selectedProjectItems packageIcon
-                hierarchicalProjectList hierarchicalProjectSelection
-                packageToItemDictionary'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'hierarchicalProjectTree selectedProjectItems packageIcon
+		hierarchicalProjectList hierarchicalProjectSelection
+		packageToItemDictionary'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 HierarchicalItem subclass:#ProjectItem
-        instanceVariableNames:'label packageID'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser::HierarchicalProjectList
+	instanceVariableNames:'label packageID'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser::HierarchicalProjectList
 !
 
 ApplicationModel subclass:#SpecialCodeView
-        instanceVariableNames:'displayMode'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'displayMode'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 NewSystemBrowser::BrowserList subclass:#VariableList
-        instanceVariableNames:'variableList classHolder showClassVars'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:NewSystemBrowser
+	instanceVariableNames:'variableList classHolder showClassVars'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:NewSystemBrowser
 !
 
 !NewSystemBrowser class methodsFor:'documentation'!
@@ -36077,9 +36077,14 @@
 !
 
 isClass:aClass shownWithNameSpaceFilter:nameSpaceFilter
-     nameSpaceFilter isNil ifTrue:[^ true].
-     (nameSpaceFilter includes:aClass topNameSpace name) ifTrue:[^ true].
-     ^ false
+    |nsName|
+
+    nameSpaceFilter isNil ifTrue:[^ true].
+    nsName := aClass topNameSpace name.
+
+    (nameSpaceFilter includes:nsName) ifTrue:[^ true].
+    (nameSpaceFilter contains:[:ns | nsName startsWith:(ns , '::')]) ifTrue:[^ true].
+    ^ false
 !
 
 isClass:aClass shownWithPackageFilter:packageFilter
@@ -43941,16 +43946,16 @@
 makeGenerator
     "return a generator which enumerates the classes from the selected namespace(s)."
 
-    |spaces hideUnloadedClasses|
-
-    spaces := self selectedNamespaces value.
-    spaces size == 0 ifTrue:[
+    |spaceNames hideUnloadedClasses|
+
+    spaceNames := self selectedNamespaces value.
+    spaceNames size == 0 ifTrue:[
         ^ #()
     ].
 
     hideUnloadedClasses := self hideUnloadedClasses value.
 
-    (spaces includes:(self class nameListEntryForALL)) ifTrue:[
+    (spaceNames includes:(self class nameListEntryForALL)) ifTrue:[
         hideUnloadedClasses ifTrue:[
             ^ Iterator on:[:whatToDo |
                                Smalltalk allClassesDo:[:cls |
@@ -43967,8 +43972,8 @@
                       ]
     ].
 
-    (spaces size == 1 
-     and:[spaces first = 'Smalltalk']) ifTrue:[
+    (spaceNames size == 1 
+     and:[spaceNames first = 'Smalltalk']) ifTrue:[
         "/ somewhat tuned - quick look if classes name
         "/ includes colons ...
         ^ Iterator on:[:whatToDo |
@@ -43997,17 +44002,17 @@
 
     ^ Iterator on:[:whatToDo |
                        Smalltalk allClassesDo:[:cls |
-                           |includeIt|
-
-                           includeIt := cls isPrivate not 
-                                        and:[(spaces includes:cls nameSpace name)].
-                           includeIt := includeIt
-                                        or:[(cls isPrivate  
-                                            and:[(spaces includes:cls topOwningClass nameSpace name)])].
-
-                           includeIt := includeIt
-                                        and:[hideUnloadedClasses not
-                                              or:[cls isLoaded]].
+                           |spaceOfClass spaceNameOfClass includeIt|
+
+                           spaceOfClass := cls isPrivate ifTrue:[cls topOwningClass nameSpace] ifFalse:[cls nameSpace].
+                           spaceNameOfClass := spaceOfClass name.
+
+                           includeIt := spaceNames contains:[:nm | nm = spaceNameOfClass
+                                                                   or:[spaceNameOfClass startsWith:(nm , '::')]].
+
+                           hideUnloadedClasses ifTrue:[
+                               includeIt := includeIt and:[cls isLoaded].
+                           ].
                            includeIt ifTrue:[
                                cls isNameSpace ifFalse:[
                                    whatToDo value:cls
@@ -56243,7 +56248,7 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.590 2003-05-26 09:33:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.591 2003-06-06 17:56:19 cg Exp $'
 ! !
 
 NewSystemBrowser initialize!
hg/stx-libtool