--- a/ChangeSet.st	Wed Apr 09 13:38:42 2003 +0200
+++ b/ChangeSet.st	Wed Apr 09 13:53:31 2003 +0200
@@ -540,15 +540,18 @@
     "Modified: / 14.11.2001 / 13:35:37 / cg"
 !
 
-addClassRemoveChange:oldClassName
+addClassRemoveChange:oldClass 
     "add a classRemove change to the receiver"
 
     |newChange|
 
-    newChange := ClassRemoveChange new className:oldClassName.
+    newChange := ClassRemoveChange new className:oldClass name.
     changedClasses := nil.
-    self addChange:newChange
-
+    ClassRemoveChange::ClassBeingRemovedQuery 
+        answer:oldClass
+        do:[
+            self addChange:newChange
+        ]
     "Modified: / 14.11.2001 / 13:35:39 / cg"
 !
 
@@ -615,7 +618,7 @@
                         source:aMethod source
                         category:aMethod category.
     oldMethod notNil ifTrue:[
-        newChange previousVersion:oldMethod source.
+        newChange previousVersion:oldMethod.
     ].
     self rememberChangedClass:aClass.
     self addChange:newChange.
@@ -701,7 +704,7 @@
 
     newChange := MethodRemoveChange class:aClass selector:aSelector.
     oldMethod notNil ifTrue:[
-        newChange previousVersion:oldMethod source.
+        newChange previousVersion:oldMethod.
     ].
     self rememberChangedClass:aClass.
     self addChange:newChange
@@ -737,6 +740,8 @@
 addChange:aChange
     aChange timeStamp:(AbsoluteTime now).
     self add:aChange.
+
+"/    aChange sendChangeNotificationThroughSmalltalk. 
     self changed:#addChange: with:aChange.
 
     "Created: / 14.11.2001 / 13:35:11 / cg"
@@ -780,11 +785,11 @@
     nameOfClass := aClass name.
 
     ^ self contains:[:aChange | 
-                        aChange selector = selector
+                        selector = aChange selector 
                         ifFalse:[
                             false
                         ] ifTrue:[
-                            aChange className = nameOfClass 
+                            nameOfClass = aChange className
                         ]
                     ]
 
@@ -1877,5 +1882,5 @@
 !ChangeSet class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.95 2003-02-25 11:48:24 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.96 2003-04-09 11:53:31 james Exp $'
 ! !