# HG changeset patch
# User ps
# Date 946552035 -3600
# Node ID f7d6a1e1a89012ea2d969a24b933f6f64f96ec0c
# Parent  d6e0aca50f36fb53d419768d85f7eadcdd783a9e
checkin from browser

diff -r d6e0aca50f36 -r f7d6a1e1a890 Project.st
--- a/Project.st	Wed Dec 29 15:50:30 1999 +0100
+++ b/Project.st	Thu Dec 30 12:07:15 1999 +0100
@@ -873,7 +873,7 @@
     (changeSet := self changeSet) notNil ifTrue:[
         changeSet addClassDefinitionChangeFor:aClass 
     ].
-    self changedClasses add:aClass
+    self rememberChangedClass:aClass
 !
 
 addMethodCategoryChange:aMethod category:newCategory in:aClass
@@ -884,7 +884,7 @@
     (changeSet := self changeSet) notNil ifTrue:[
         changeSet addMethodCategoryChange:aMethod category:newCategory in:aClass 
     ].
-    self changedClasses add:aClass
+    self rememberChangedClass:aClass
 
 !
 
@@ -896,7 +896,7 @@
     (changeSet := self changeSet) notNil ifTrue:[
         changeSet addMethodChange:aMethod in:aClass 
     ].
-    self changedClasses add:aClass
+    self rememberChangedClass:aClass
 
 !
 
@@ -908,7 +908,8 @@
     (changeSet := self changeSet) notNil ifTrue:[
         changeSet addMethodPrivacyChange:aMethod in:aClass 
     ].
-    self changedClasses add:aClass
+    self rememberChangedClass:aClass
+
 !
 
 addPrimitiveDefinitionsChangeFor:aClass
@@ -919,7 +920,8 @@
     (changeSet := self changeSet) notNil ifTrue:[
         changeSet addPrimitiveDefinitionsChangeFor:aClass 
     ].
-    self changedClasses add:aClass
+    self rememberChangedClass:aClass
+
 !
 
 addPrimitiveFunctionsChangeFor:aClass
@@ -930,7 +932,8 @@
     (changeSet := self changeSet) notNil ifTrue:[
         changeSet addPrimitiveFunctionsChangeFor:aClass 
     ].
-    self changedClasses add:aClass
+    self rememberChangedClass:aClass
+
 !
 
 addPrimitiveVariablesChangeFor:aClass
@@ -941,7 +944,8 @@
     (changeSet := self changeSet) notNil ifTrue:[
         changeSet addPrimitiveVariablesChangeFor:aClass 
     ].
-    self changedClasses add:aClass
+    self rememberChangedClass:aClass
+
 !
 
 addRemoveSelectorChange:aSelector in:aClass
@@ -952,7 +956,8 @@
     (changeSet := self changeSet) notNil ifTrue:[
         changeSet addRemoveSelectorChange:aSelector in:aClass 
     ].
-    self changedClasses add:aClass
+    self rememberChangedClass:aClass
+
 !
 
 condenseChangesForClassCheckin:aClass
@@ -964,7 +969,23 @@
     #TODO.
     "/ do not remove, if there are still methodChanges for other
     "/ packages around
-    changedClasses := self changedClasses select:[:cls | cls name ~= aClass name].
+    changedClasses := self changedClasses select:[:cls | |realClass|
+                                                   (realClass := cls) isMeta ifTrue:[
+                                                       realClass := cls soleInstance
+                                                   ].
+                                                   realClass name ~= aClass name
+                                                 ].
+!
+
+rememberChangedClass:aClass
+    |realClass|
+
+    (realClass := aClass) isMeta ifTrue:[
+        realClass := aClass soleInstance
+    ].
+    self changedClasses add:realClass
+
+
 !
 
 rememberOverwrittenMethod:newMethod from:oldMethod
@@ -3457,6 +3478,6 @@
 !Project class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Project.st,v 1.134 1999-12-29 14:50:30 ps Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Project.st,v 1.135 1999-12-30 11:07:15 ps Exp $'
 ! !
 Project initialize!