--- a/Tools_ClassList.st Thu Aug 10 17:14:33 2006 +0200
+++ b/Tools_ClassList.st Thu Aug 10 17:16:28 2006 +0200
@@ -1006,22 +1006,22 @@
allName := self class nameListEntryForALL.
nameSpaceFilter := self nameSpaceFilter value.
nameSpaceFilter notNil ifTrue:[
- (nameSpaceFilter includes:allName) ifTrue:[nameSpaceFilter := nil].
+ (nameSpaceFilter includes:allName) ifTrue:[nameSpaceFilter := nil].
].
packageFilter := self packageFilter value.
packageFilter notNil ifTrue:[
- (packageFilter includes:allName) ifTrue:[packageFilter := nil].
+ (packageFilter includes:allName) ifTrue:[packageFilter := nil].
].
inGeneratorHolder isNil ifTrue:[
- "/ for standAlone testing
- generator := Smalltalk allClasses.
- (self hideUnloadedClasses value) ifTrue:[
- generator := generator select:[:cls | cls isLoaded]
- ].
+ "/ for standAlone testing
+ generator := Smalltalk allClasses.
+ (self hideUnloadedClasses value) ifTrue:[
+ generator := generator select:[:cls | cls isLoaded]
+ ].
] ifFalse:[
- generator := inGeneratorHolder value.
- generator isNil ifTrue:[^ #() ].
+ generator := inGeneratorHolder value.
+ generator isNil ifTrue:[^ #() ].
].
classesAlready := IdentitySet new.
@@ -1031,54 +1031,54 @@
privateClassesPerClass := IdentityDictionary new.
generator do:[:cls |
- |owner bucket|
+ |owner bucket|
- (hidePrivate not or:[cls isPrivate not])
- ifTrue:[
- (nameSpaceFilter isNil
- or:[self isClass:cls shownWithNameSpaceFilter:nameSpaceFilter]) ifTrue:[
- (packageFilter isNil
- or:[self isClass:cls shownWithPackageFilter:packageFilter]) ifTrue:[
- (classesAlready includes:cls) ifFalse:[
- classesAlready add:cls.
- (owner := cls owningClass) notNil ifTrue:[
- bucket := privateClassesPerClass at:owner ifAbsentPut:[SortedCollection new sortBlock:[:a :b | a name < b name] ].
- bucket add:cls.
- ] ifFalse:[
- classesOrdered add:cls.
- ]
- ]
- ]
- ]
- ]
+ (hidePrivate not or:[cls isPrivate not])
+ ifTrue:[
+ (nameSpaceFilter isNil
+ or:[self isClass:cls shownWithNameSpaceFilter:nameSpaceFilter]) ifTrue:[
+ (packageFilter isNil
+ or:[self isClass:cls shownWithPackageFilter:packageFilter]) ifTrue:[
+ (classesAlready includes:cls) ifFalse:[
+ classesAlready add:cls.
+ (owner := cls owningClass) notNil ifTrue:[
+ bucket := privateClassesPerClass at:owner ifAbsentPut:[SortedCollection new sortBlock:[:a :b | a name < b name] ].
+ bucket add:cls.
+ ] ifFalse:[
+ classesOrdered add:cls.
+ ]
+ ]
+ ]
+ ]
+ ]
].
classesOrdered size == 1 ifTrue:[
- self classLabelHolder value:(classesOrdered first name)
+ self classLabelHolder value:(classesOrdered first name)
] ifFalse:[
"/ self classLabelHolder value:(classes size printString , ' classes').
- sortBy value ~~ #doNotSort ifTrue:[
- classesOrdered sort:[:a :b | a name < b name].
- ]
+ sortBy value ~~ #doNotSort ifTrue:[
+ classesOrdered sort:[:a :b | a name < b name].
+ ]
].
privateClassesPerClass notEmpty ifTrue:[
- |stream action|
+ |stream action|
- stream := WriteStream on:(Array new).
+ stream := WriteStream on:(Array new).
- action := [:eachClass |
- |bucket|
+ action := [:eachClass |
+ |bucket|
- stream nextPut:eachClass.
- bucket := privateClassesPerClass at:eachClass ifAbsent:nil.
- bucket notNil ifTrue:[
- bucket do:action.
- ]
- ].
+ stream nextPut:eachClass.
+ bucket := privateClassesPerClass at:eachClass ifAbsent:nil.
+ bucket notNil ifTrue:[
+ bucket do:action.
+ ]
+ ].
- classesOrdered do:action.
- classesOrdered := stream contents.
+ classesOrdered do:action.
+ classesOrdered := stream contents.
].
"/
@@ -1086,7 +1086,7 @@
"/ classes addFirst:AllEntry.
^ classesOrdered
- "Modified: / 18.8.2000 / 20:34:10 / cg"
+ "Modified: / 10-08-2006 / 15:00:57 / cg"
!
makeDependent
@@ -1269,6 +1269,10 @@
].
]
].
+
+ isInChangeSet ifTrue:[
+ nm := nm , ' *'
+ ].
"/ cls isVisualStartable ifTrue:[
"/ nm := LabelAndIcon icon:((SystemBrowser visualStartableClassIcon)
"/ onDevice:self window device)
@@ -1287,7 +1291,7 @@
^ nameList
- "Modified: / 5.11.2001 / 09:50:27 / cg"
+ "Modified: / 10-08-2006 / 17:02:32 / cg"
!
nameListIconForClass:cls
@@ -1644,5 +1648,5 @@
!ClassList class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassList.st,v 1.16 2006-08-07 10:17:08 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassList.st,v 1.17 2006-08-10 15:16:28 cg Exp $'
! !