--- a/Tools_ClassList.st Fri Sep 10 16:06:27 2004 +0200
+++ b/Tools_ClassList.st Sun Sep 12 16:45:40 2004 +0200
@@ -1067,65 +1067,66 @@
aClass == (self class nameListEntryForALL) ifTrue:[ ^ aClass ].
nm := aClass nameInBrowser.
+
aClass isLoaded ifFalse:[
- unloadedClassesColor notNil ifTrue:[
- nm := nm asText emphasizeAllWith:(#color->unloadedClassesColor)
- ]
+ unloadedClassesColor notNil ifTrue:[
+ nm := nm asText emphasizeAllWith:(#color->unloadedClassesColor)
+ ]
].
orgMode := organizerMode value.
orgMode == #hierarchy ifTrue:[
- "/ always show the full name
- ^ nm
+ "/ always show the full name
+ ^ nm
].
orgMode == #classHierarchy ifTrue:[
- "/ always show the full name
- ^ nm
+ "/ always show the full name
+ ^ nm
].
aClass isJavaClass ifTrue:[
- "/ only show the last name, unless multiple packages are shown in the list
- javaPackage := aClass package.
- (self classList value contains:[:cls | cls package ~= javaPackage]) ifTrue:[
- ^ nm
- ].
- ^ aClass lastName
+ "/ only show the last name, unless multiple packages are shown in the list
+ javaPackage := aClass package.
+ (self classList value contains:[:cls | cls package ~= javaPackage]) ifTrue:[
+ ^ nm
+ ].
+ ^ aClass lastName
].
useFullName ifFalse:[
- aClass isPrivate ifFalse:[
- ^ aClass nameWithoutNameSpacePrefix
- ]
+ aClass isPrivate ifFalse:[
+ ^ aClass nameWithoutNameSpacePrefix
+ ]
].
"/ full name required if owner is not in the list
owner := aClass owningClass.
(owner isNil
or:[(self classList value includesIdentical:owner) not]) ifTrue:[
- ^ nm
+ ^ nm
].
"/ namespace
indent := 0.
index := 1.
[(index := nm indexOf:$: startingAt:index) ~~ 0] whileTrue:[
- indent := indent + 1.
- index := index + 2.
+ indent := indent + 1.
+ index := index + 2.
].
indent == 0 ifFalse:[
- indent <= 5 ifTrue:[
- indentString := #(
- ''
- ' '
- ' '
- ' '
- ' '
- ' '
- ) at:indent+1.
- ] ifFalse:[
- indentString := String new:indent*2 withAll:Character space.
- ].
- nm := indentString , '::' , aClass nameWithoutPrefix
+ indent <= 5 ifTrue:[
+ indentString := #(
+ ''
+ ' '
+ ' '
+ ' '
+ ' '
+ ' '
+ ) at:indent+1.
+ ] ifFalse:[
+ indentString := String new:indent*2 withAll:Character space.
+ ].
+ nm := indentString , '::' , aClass nameWithoutPrefix
].
^ nm
@@ -1212,7 +1213,7 @@
showClassPackages value == true ifTrue:[
"/ add the package;
hasExtensions ifTrue:[
- nm := nm , pkg , (self emphasizeForDifferentPackage:'+').
+ nm := nm , ' [ ' , pkg, ' ]' , (self emphasizeForDifferentPackage:'+').
"/ isInChangeSet ifFalse:[
"/ nm := self colorizeForDifferentPackage:nm
"/ ].
@@ -1568,5 +1569,5 @@
!ClassList class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassList.st,v 1.3 2004-07-15 12:23:53 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassList.st,v 1.4 2004-09-12 14:45:07 ca Exp $'
! !