diff -r d9e1b1a352b6 -r b25c25ff6211 Tools_MethodCategoryList.st --- a/Tools_MethodCategoryList.st Sat Nov 03 19:01:21 2012 +0100 +++ b/Tools_MethodCategoryList.st Sun Nov 04 11:40:58 2012 +0100 @@ -1173,18 +1173,17 @@ numAnnotated numFullyCovered numPartiallyCovered numUncovered numNotInstrumented showPseudoProtocols showCoverageInformation addPseudoEntry addPseudoEntryWithColor countAll pseudoEntryColor userPreferences - startTime lazyPseudoProtocols needsSpecialColoring| + startTime suppressPseudoProtocolsNow needsSpecialColoring| userPreferences := UserPreferences current. countAll := true. startTime := Timestamp now. - lazyPseudoProtocols := false. + suppressPseudoProtocolsNow := false. generator := inGeneratorHolder value. generator isNil ifTrue:[ ^ #() ]. - showPseudoProtocols := self showPseudoProtocols value - and:[builder window notNil and:[builder window shown]]. + showPseudoProtocols := self showPseudoProtocols value. showCoverageInformation := self showCoverageInformation value. nameListEntryForALL := self class nameListEntryForALL. @@ -1299,8 +1298,8 @@ and:[ showChanges not ]]. suppress ifFalse:[ categoryBag add:cat. - lazyPseudoProtocols ifFalse:[ - info := self methodInfoFor:mthd in:cls selector:sel lazy:lazyPseudoProtocols. + suppressPseudoProtocolsNow ifFalse:[ + info := self methodInfoFor:mthd in:cls selector:sel lazy:suppressPseudoProtocolsNow. info notNil ifTrue:[ info isObsolete ifTrue:[ numObsolete := numObsolete + 1 ]. info sendsSuper ifTrue:[ numSuper := numSuper + 1 ]. @@ -1315,10 +1314,11 @@ info isAnnotated ifTrue:[ numAnnotated := numAnnotated + 1]. ]. (Timestamp now deltaFrom:startTime) > 5 seconds ifTrue:[ - lazyPseudoProtocols := true. - "/ because we already computed for 10seconds, more and more will be found in + suppressPseudoProtocolsNow := true. + "/ because we already computed for 5 seconds, more and more will be found in "/ the cache, and eventually, pseudo protocols will be shown anyway masterApplication showInfo:'suppress pseudo protocols - parsing took too long'. + self enqueueDelayedUpdateList. ]. ] ] @@ -1390,7 +1390,7 @@ ]. (packageFilter isNil or:[ packageFilter includes:eachClass package ]) ifTrue:[ - (lazyPseudoProtocols not and:[showPseudoProtocols value]) ifTrue:[ + (suppressPseudoProtocolsNow not and:[showPseudoProtocols]) ifTrue:[ "/ see if there is a subclassResponsibility in a superclass required := SmalltalkCodeGeneratorTool missingRequiredProtocolFor:eachClass. numMissingRequired := numMissingRequired + required size. @@ -1525,7 +1525,7 @@ ]. ]. - (lazyPseudoProtocols not and:[showPseudoProtocols value]) ifTrue:[ + (suppressPseudoProtocolsNow not and:[showPseudoProtocols]) ifTrue:[ addPseudoEntryWithColor := [:s :n :clr | n > 0 ifTrue:[ categoryList @@ -2073,11 +2073,11 @@ !MethodCategoryList class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodCategoryList.st,v 1.87 2012-10-30 11:25:03 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodCategoryList.st,v 1.88 2012-11-04 10:40:58 cg Exp $' ! version_CVS - ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodCategoryList.st,v 1.87 2012-10-30 11:25:03 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodCategoryList.st,v 1.88 2012-11-04 10:40:58 cg Exp $' ! ! MethodCategoryList initialize!