Tools_MethodCategoryList.st
changeset 7501 c469ba228dda
parent 7398 8a3a5fac2001
child 8219 57088175dcda
--- a/Tools_MethodCategoryList.st	Fri Nov 10 17:26:22 2006 +0100
+++ b/Tools_MethodCategoryList.st	Fri Nov 10 17:56:52 2006 +0100
@@ -914,7 +914,7 @@
     |categoryList plainCategories classesProcessed leafClassesProcessed
      generator nm variablesToHighlight classVarsToHighLight
      itemsWithVarRefs itemsWithVarMods itemsWithExtensions itemsWithSuppressedExtensions
-     itemsInChangeSet
+     itemsInChangeSet itemsInRemoteChangeSet
      packageFilterOnInput packageFilter nameListEntryForALL changeSet emphasizedPlus emphasisForRef emphasisForMod|
 
     generator := inGeneratorHolder value.
@@ -937,6 +937,7 @@
     itemsWithExtensions := Set new.
     itemsWithSuppressedExtensions := Set new.
     itemsInChangeSet := Set new.
+    itemsInRemoteChangeSet := Set new.
     plainCategories := Set new.
     classesProcessed := IdentitySet new.
     leafClassesProcessed := IdentitySet new.
@@ -1033,7 +1034,10 @@
             ].
             (changeSet includesChangeForClass:eachClass selector:mSelector) ifTrue:[
                 itemsInChangeSet add:mCategory.    
-            ]
+            ].
+            (SmallTeam notNil and:[ SmallTeam includesChangeForClass:eachClass selector:mSelector] ) ifTrue:[
+                itemsInRemoteChangeSet add:mCategory.    
+            ].
         ]
     ].
 
@@ -1046,17 +1050,24 @@
     emphasisForMod := UserPreferences current emphasisForWrittenVariable.
 
     (itemsInChangeSet notEmpty 
+    or:[itemsInRemoteChangeSet notEmpty
     or:[itemsWithExtensions notEmpty
-    or:[itemsWithVarRefs notEmpty] ]) ifTrue:[
+    or:[itemsWithVarRefs notEmpty]] ]) ifTrue:[
         rawProtocolList keysAndValuesDo:[:idx :cat |
-            |item inChangeSet hasExtensions hasVarRef hasVarMod|
+            |item inChangeSet inRemoteChangeSet hasExtensions hasVarRef hasVarMod|
 
             item := cat.
+
             inChangeSet := itemsInChangeSet includes:cat.
             inChangeSet ifTrue:[
                 item := self colorizeForChangedCode:cat.
             ].
 
+            inRemoteChangeSet := itemsInRemoteChangeSet includes:cat.
+            inRemoteChangeSet ifTrue:[
+                item := (self colorizeForChangedCodeInSmallTeam:'!! '),item.
+            ].
+
             hasVarRef := itemsWithVarRefs includes:cat.
             hasVarRef ifTrue:[
                 hasVarMod := itemsWithVarMods includes:cat.
@@ -1110,11 +1121,14 @@
     ^ categoryList
 
     "Created: / 05-02-2000 / 13:42:11 / cg"
-    "Modified: / 29-08-2006 / 10:27:50 / cg"
+    "Modified: / 10-11-2006 / 17:35:53 / cg"
 !
 
 makeDependent
-    Smalltalk addDependent:self
+    Smalltalk addDependent:self.
+"/    ChangeSet addDependent:self.
+
+    "Modified: / 10-11-2006 / 17:57:13 / cg"
 !
 
 makeIndependent
@@ -1281,5 +1295,5 @@
 !MethodCategoryList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodCategoryList.st,v 1.21 2006-10-12 23:27:13 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodCategoryList.st,v 1.22 2006-11-10 16:56:52 cg Exp $'
 ! !