--- a/Tools_MethodCategoryList.st	Thu Mar 14 14:50:08 2013 +0100
+++ b/Tools_MethodCategoryList.st	Fri Mar 15 21:28:09 2013 +0100
@@ -1225,6 +1225,7 @@
     numRedefine := numRedefined := numOverride := numExtension := numMissingRequired := numSubclassResponsibility := 0.
     numNotInstrumented := numFullyCovered := numPartiallyCovered := numUncovered := 0.
     numAnnotated := 0.
+    numAll := 0.
 
     generator do:[:clsIn :catIn | 
                         |emptyProtocols clsName doHighLight doHighLightRed includedCats|
@@ -1297,6 +1298,7 @@
                                                 and:[ (packageFilter includes:mthd package) not 
                                                 and:[ showChanges not ]].
                                     suppress ifFalse:[
+        numAll := numAll + 1.
                                         categoryBag add:cat.
                                         suppressPseudoProtocolsNow ifFalse:[
                                             info := self methodInfoFor:mthd in:cls selector:sel lazy:suppressPseudoProtocolsNow.
@@ -1327,8 +1329,6 @@
                         ]
                  ].
 
-    numAll := 0.
-
     changeSet := ChangeSet current.
 
     classesProcessed do:[:eachClass |
@@ -1349,13 +1349,13 @@
             ].
             mPackage ~~ classPackage ifTrue:[
                 (mCategory notNil and:[mPackage ~= PackageId noProjectID]) ifTrue:[
-                    itemsWithExtensions add:mCategory.    
-
                     (packageFilter notNil 
                     and:[ (packageFilter includes:mPackage) not])
                     ifTrue:[
                         itemsWithSuppressedExtensions add:mCategory.    
-                    ].
+                    ] ifFalse:[
+                        itemsWithExtensions add:mCategory.    
+                    ]
                 ].
             ].
 
@@ -1382,7 +1382,13 @@
                 ].
             ].
             (changeSet includesChangeForClass:eachClass selector:mSelector) ifTrue:[
-                itemsInChangeSet add:mCategory.    
+                (packageFilter notNil 
+                and:[ (packageFilter includes:mPackage) not])
+                ifTrue:[
+                    "/ itemsInChangeSetSuppressed add:mCategory.    
+                ] ifFalse:[
+                    itemsInChangeSet add:mCategory.    
+                ]
             ].
             (SmallTeam notNil and:[ SmallTeam includesChangeForClass:eachClass selector:mSelector] ) ifTrue:[
                 itemsInRemoteChangeSet add:mCategory.    
@@ -1396,7 +1402,6 @@
                 numMissingRequired := numMissingRequired + required size.
             ].
         ].
-        numAll := numAll + (eachClass methodDictionary size)
     ].
 
     pseudoEntryColor := self class pseudoEntryForegroundColor.
@@ -2073,11 +2078,11 @@
 !MethodCategoryList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodCategoryList.st,v 1.90 2013-02-08 19:01:05 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodCategoryList.st,v 1.91 2013-03-15 20:28:09 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodCategoryList.st,v 1.90 2013-02-08 19:01:05 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodCategoryList.st,v 1.91 2013-03-15 20:28:09 cg Exp $'
 ! !