--- a/Tools_ClassList.st Wed Feb 05 19:58:15 2014 +0100
+++ b/Tools_ClassList.st Wed Feb 05 19:58:39 2014 +0100
@@ -856,7 +856,8 @@
something == #lastTestRunResult ifTrue:[
cls := aParameter at:1.
sel := aParameter at:2.
- (cls notNil and:[sel isNil]) ifTrue:[
+ "/ JV: Note: change is triggered only if outcome changes
+ cls notNil ifTrue:[
classListValue size > 0 ifTrue:[
((classListValue includesIdentical:cls theNonMetaclass)
or:[(classListValue includesIdentical:cls theMetaclass)]) ifTrue:[
@@ -937,6 +938,7 @@
super update:something with:aParameter from:changedObject
"Modified: / 05-06-2012 / 23:39:34 / cg"
+ "Modified: / 06-12-2013 / 17:06:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!ClassList methodsFor:'drag & drop'!
@@ -1144,6 +1146,7 @@
"Modified: / 24-02-2000 / 23:18:26 / cg"
"Created: / 07-08-2011 / 19:01:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 24-08-2013 / 00:38:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
outGeneratorHolderForMethods
@@ -1243,7 +1246,7 @@
classesAlready add:cls.
(nameFilter isNil
or:[ (nameFilterIncludesMatchCharacters not and:[ cls name asLowercase startsWith:lcNameFilter])
- or:[ (nameFilterIncludesMatchCharacters and:[nameFilter match:cls name caseSensitive:false]) ]]) ifTrue:[
+ or:[ (nameFilterIncludesMatchCharacters and:[nameFilter match:cls name ignoreCase:true]) ]]) ifTrue:[
(owner := cls owningClass) notNil ifTrue:[
bucket := privateClassesPerClass
at:owner
@@ -1493,8 +1496,8 @@
aClassList do:[:cls |
cls isJavaClass ifTrue:[
javaClassCountsByBame
- at: cls name
- put: (javaClassCountsByBame at: cls name ifAbsent:[0]) + 1
+ at: cls binaryName
+ put: (javaClassCountsByBame at: cls ifAbsent:[0]) + 1
]
].
@@ -1510,7 +1513,7 @@
nm := self nameListEntryFor:cls withNameSpace:showNamespaces.
cls isJavaClass ifTrue:[
- (javaClassCountsByBame at: cls name) > 1 ifTrue:[
+ (javaClassCountsByBame at: cls binaryName) > 1 ifTrue:[
| cl clstring |
cl := cls classLoader.
@@ -1608,7 +1611,7 @@
^ nameList
"Modified: / 27-10-2012 / 12:32:20 / cg"
- "Modified: / 06-09-2013 / 18:13:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 06-09-2013 / 12:06:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
reconstructNameList
@@ -1679,17 +1682,7 @@
|newClass|
meta := cls isMeta.
- "/ Sigh, special care has to be taken for Java classes as
- "/ for them, !!!!!! (environment at: javaClass name) ~~ javaClass !!!!!!
- cls theNonMetaclass isJavaClass ifTrue:[
- "/ Can't use JavaVM>>classNamed:definedBy: for Java classes because environment
- "/ could not be Java class. Do a full search instead, sigh...
- newClass := environment allClasses
- detect:[:each|each isJavaClass and:[each name == cls theNonMetaclass name and:[each classLoader == cls theNonMetaclass classLoader]]]
- ifNone:[nil].
- ] ifFalse:[
- newClass := environment at:(cls theNonMetaclass name).
- ].
+ newClass := environment at:(cls theNonMetaclass name).
newClass isNil ifTrue:[
newClass := cls
] ifFalse:[
@@ -1706,17 +1699,7 @@
cls notNil ifTrue:[
meta := cls isMeta.
- "/ Sigh, special care has to be taken for Java classes as
- "/ for them, !!!!!! (environment at: javaClass name) ~~ javaClass !!!!!!
- cls theNonMetaclass isJavaClass ifTrue:[
- "/ Can't use JavaVM>>classNamed:definedBy: for Java classes because environment
- "/ could not be Java class. Do a full search instead, sigh...
- newClass := environment allClasses
- detect:[:each|each isJavaClass and:[each name == cls theNonMetaclass name and:[each classLoader == cls theNonMetaclass classLoader]]]
- ifNone:[nil].
- ] ifFalse:[
- newClass := environment at:(cls theNonMetaclass name).
- ].
+ newClass := environment at:(cls theNonMetaclass name).
newClass isNil ifTrue:[
newClass := cls
] ifFalse:[
@@ -1731,7 +1714,7 @@
].
^ found
- "Modified: / 06-09-2013 / 18:10:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 04-08-2013 / 13:48:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
updateList
@@ -1747,8 +1730,8 @@
classesRemovedFromList := OrderedCollection new.
newSet := newList asSet.
oldSet := oldList asSet.
- classesAddedToList := newSet reject:[:eachNewClass | (oldSet includes:eachNewClass)].
- classesRemovedFromList := oldSet reject:[:eachOldClass | (newSet includes:eachOldClass)].
+ classesAddedToList := newSet select:[:eachNewClass | (oldSet includes:eachNewClass) not].
+ classesRemovedFromList := oldSet select:[:eachOldClass | (newSet includes:eachOldClass) not].
].
(newList ~= oldList
@@ -1795,9 +1778,11 @@
].
newSelectionIndices := prevSelection
- collect:[:item | |cls|
- cls := environment at:item theNonMetaclass name.
- newList identityIndexOf:cls]
+ collect:[:item |
+ |cls|
+
+ cls := environment at:item theNonMetaclass name.
+ newList identityIndexOf:cls]
thenSelect:[:index | index ~~ 0].
selectedClassNameIndicesHolder := self selectedClassNameIndices.
@@ -1828,8 +1813,9 @@
].
listValid := true.
- "Created: / 5.2.2000 / 13:42:18 / cg"
- "Modified: / 31.10.2001 / 11:35:39 / cg"
+ "Created: / 05-02-2000 / 13:42:18 / cg"
+ "Modified: / 31-10-2001 / 11:35:39 / cg"
+ "Modified: / 24-09-2013 / 23:30:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
updateListsFor:aClass
@@ -1940,13 +1926,13 @@
!
nameListEntryFor:aClass withNameSpace:useFullName
- |sortByNameAndInheritance nm indent owner orgMode indentString javaPackage|
+ |sortByNameAndInheritanceValue nm indent owner orgMode indentString javaPackage|
aClass == (self class nameListEntryForALL) ifTrue:[ ^ aClass ].
- sortByNameAndInheritance := self sortByNameAndInheritance value.
+ sortByNameAndInheritanceValue := self sortByNameAndInheritance value.
- sortByNameAndInheritance ifTrue:[
+ sortByNameAndInheritanceValue ifTrue:[
nm := (self nameListIndentStringFor: aClass withNameSpace: useFullName) , aClass nameInBrowser.
] ifFalse:[
nm := aClass nameInBrowser.
@@ -1961,7 +1947,6 @@
aClass isLoaded ifFalse:[
"/ nm := nm,(' (?) ' colorizeAllWith:Color grey).
] ifTrue:[
- nm := (nm , ' ').
aClass isAbstract ifTrue:[ nm := nm allItalic ].
nm := nm,((' (%1+%2) ' bindWith:(aClass methodDictionary size) with:(aClass class methodDictionary size))
colorizeAllWith:self class pseudoEntryForegroundColor).
@@ -1988,7 +1973,7 @@
useFullName ifFalse:[
aClass isPrivate ifFalse:[
- sortByNameAndInheritance ifTrue:[
+ sortByNameAndInheritanceValue ifTrue:[
^ (self nameListIndentStringFor: aClass withNameSpace: useFullName) , aClass nameWithoutNameSpacePrefix
].
^ aClass nameWithoutNameSpacePrefix
@@ -2005,7 +1990,7 @@
indent > 0 ifTrue:[
indent := indent * self indentPerPrivacyLevel.
indentString := String new:indent withAll:Character space.
- sortByNameAndInheritance ifTrue:[
+ sortByNameAndInheritanceValue ifTrue:[
nm := (self nameListIndentStringFor:owner withNameSpace:useFullName)
, indentString , '::' , aClass nameWithoutPrefix.
] ifFalse:[
@@ -2101,10 +2086,10 @@
!ClassList class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassList.st,v 1.78 2013-09-10 10:46:19 vrany Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassList.st,v 1.79 2014-02-05 18:58:39 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassList.st,v 1.78 2013-09-10 10:46:19 vrany Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools_ClassList.st,v 1.79 2014-02-05 18:58:39 cg Exp $'
! !