--- a/Tools__MethodList.st Sat Apr 02 16:27:56 2016 +0200
+++ b/Tools__MethodList.st Sat Apr 02 16:28:58 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
COPYRIGHT (c) 2000 by eXept Software AG
All Rights Reserved
@@ -16,10 +14,11 @@
"{ NameSpace: Tools }"
BrowserList subclass:#MethodList
- instanceVariableNames:'classes selectedMethodNameIndices methodList lastSelectedMethods
- browserNameList variableFilter filterClassVars updateProcess
- lastShowClass lastShowCategory lastShowClassFirst
- showMethodInheritance lastMethodClass lastMethodClassesSubclasses
+ instanceVariableNames:'classes selectedMethodNameIndices methodList methodNameList
+ lastSelectedMethods browserNameList variableFilter
+ filterClassVars updateProcess lastShowClass lastShowCategory
+ lastShowClassFirst showMethodInheritance lastMethodClass
+ lastMethodClassesSubclasses
classAndSelectorsRedefinedBySubclassesOfClass showClass
showMethodComplexity showMethodTypeIcon
showImageResourceMethodsImages showSyntheticMethods'
@@ -1238,51 +1237,43 @@
].
].
methods := OrderedCollection new:(entries size).
+ methodNameList := OrderedCollection new:(entries size).
- "/ first generate the new methodList, and see if it is different ...
+ newNameList := OrderedCollection new:(entries size).
+
+ "/ multiple classes must add the className for some
entries do:[:entry |
- |sel mthd|
+ |cls sel mthd s needClass|
+ cls := entry at:1.
+ sel := entry at:2.
mthd := entry at:3.
- methods add:mthd.
- ].
- false "methodList = methods" "does not care for changed icons" ifTrue:[
- "/ same list
- newNameList := self browserNameList.
- ] ifFalse:[
- newNameList := OrderedCollection new:(entries size).
-
- "/ multiple classes must add the className for some
-
- entries do:[:entry |
- |cls sel mthd s needClass|
-
- cls := entry at:1.
- sel := entry at:2.
- mthd := entry at:3.
- needClass := doShowClass.
+ needClass := doShowClass.
"/ needClass ifFalse:[
"/ needClass := (selectorBag occurrencesOf:sel) > 1
"/ ].
- (suppressInheritanceInfoNow not
- and:[ (Timestamp now secondDeltaFrom:startTime) > 3 ]) ifTrue:[
- suppressInheritanceInfoNow := true.
- ].
+ (suppressInheritanceInfoNow not
+ and:[ (Timestamp now secondDeltaFrom:startTime) > 3 ]) ifTrue:[
+ suppressInheritanceInfoNow := true.
+ ].
- s := self
- listEntryForMethod:mthd
- selector:sel
- class:cls
- showClass:needClass
- showCategory:doShowCategory
- classFirst:doShowClassFirst
- suppressInheritanceInfo:suppressInheritanceInfoNow.
+ s := self
+ listEntryForMethod:mthd
+ selector:sel
+ class:cls
+ showClass:needClass
+ showCategory:doShowCategory
+ classFirst:doShowClassFirst
+ suppressInheritanceInfo:suppressInheritanceInfoNow.
- newNameList add:s.
- ].
+ newNameList add:s.
+
+ methods add:mthd.
+ methodNameList add:{ cls name . sel}.
].
+
self makeIndependent.
classes := newClasses.
self makeDependent.