--- a/ChangeSet.st	Fri Oct 26 11:24:00 2001 +0200
+++ b/ChangeSet.st	Wed Oct 31 11:53:52 2001 +0100
@@ -807,7 +807,46 @@
 !ChangeSet methodsFor:'queries'!
 
 includesChangeForClass:aClass
-    ^ self contains:[:aChange | aChange className = aClass name ]
+    |nameOfClass nameOfMetaclass|
+
+    nameOfClass := aClass theNonMetaclass name.
+    nameOfMetaclass := aClass theMetaclass name.
+
+    ^ self contains:[:aChange | |changeClassName|
+                                changeClassName := aChange className.
+                                changeClassName = nameOfClass or:[changeClassName = nameOfMetaclass]
+                    ]
+
+    "
+     ChangeSet current includesChangeForClass:ChangeSet
+    "
+
+    "Modified: / 31.10.2001 / 10:58:40 / cg"
+!
+
+includesChangeForClass:aClass selector:selector
+    |nameOfClass nameOfMetaclass|
+
+    nameOfClass := aClass theNonMetaclass name.
+    nameOfMetaclass := aClass theMetaclass name.
+
+    ^ self contains:[:aChange | |changeClassName|
+
+                                aChange selector = selector
+                                ifFalse:[
+                                    false
+                                ] ifTrue:[
+                                    changeClassName := aChange className.
+                                    changeClassName = nameOfClass or:[changeClassName = nameOfMetaclass]
+                                ]
+                    ]
+
+    "
+     ChangeSet current includesChangeForClass:ChangeSet selector:#includesChangeForClass:
+    "
+
+    "Created: / 31.10.2001 / 10:26:31 / cg"
+    "Modified: / 31.10.2001 / 10:59:49 / cg"
 ! !
 
 !ChangeSet methodsFor:'utilities'!
@@ -976,5 +1015,5 @@
 !ChangeSet class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.62 2001-10-26 08:02:48 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.63 2001-10-31 10:53:52 cg Exp $'
 ! !