--- a/MessageTracer.st	Wed Aug 04 16:08:10 1999 +0200
+++ b/MessageTracer.st	Wed Aug 04 21:34:11 1999 +0200
@@ -20,14 +20,14 @@
 	category:'System-Debugging-Support'
 !
 
-MessageTracer subclass:#PrintingMessageTracer
+MessageTracer subclass:#InteractionCollector
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:MessageTracer
 !
 
-MessageTracer subclass:#InteractionCollector
+MessageTracer subclass:#PrintingMessageTracer
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
@@ -257,7 +257,7 @@
         ObjectWrittenBreakpointSignal notifierString:'object modified'.
 
         "/ the following have been written as cheapBlocks (by purpose)
-        BreakBlock       := [:con | BreakpointSignal raiseIn:con].
+        BreakBlock       := [:con | BreakpointSignal raiseRequestWith:nil errorString:nil in:con].
         TraceSenderBlock  := [:con | MessageTracer printEntrySender:con on:(Smalltalk at:#Stderr)     ].
         TraceSenderBlock2 := [:con | MessageTracer printEntrySender:con on:(Smalltalk at:#Transcript) ].
         TraceFullBlock    := [:con | MessageTracer traceEntryFull:con on:(Smalltalk at:#Stderr)       ].
@@ -601,9 +601,9 @@
      entry/leave blocks."
 
     ^ self wrapMethod:aMethod
-              onEntry:[:context |
-                         (context receiver isMemberOf:aClass) ifTrue:[
-                             BreakpointSignal raiseIn:context
+              onEntry:[:con |
+                         (con receiver isMemberOf:aClass) ifTrue:[
+                             BreakpointSignal raiseRequestWith:nil errorString:nil in:con
                          ]
                       ]
                onExit:LeaveBreakBlock.
@@ -628,7 +628,7 @@
     ^ self wrapMethod:aMethod
               onEntry:[:con | (Processor activeProcess == aProcess)
                               ifTrue:[
-                                BreakpointSignal raiseIn:con
+                                BreakpointSignal raiseRequestWith:nil errorString:nil in:con
                               ]  
                       ]
                onExit:LeaveBreakBlock.
@@ -1899,7 +1899,7 @@
                                 copyHolder value:(anObject shallowCopy).
                                 ObjectWrittenBreakpointSignal
                                     raiseRequestWith:(oldValue -> anObject) 
-                                     errorString:('object was modififed in ' , methodName) 
+                                    errorString:('object was modififed in ' , methodName) 
                                     in:con sender
                             ]
                         ]
@@ -2803,6 +2803,15 @@
 
 ! !
 
+!MessageTracer::InteractionCollector methodsFor:'trace helpers '!
+
+stepInterrupt
+    StepInterruptPending := nil.
+    ObjectMemory flushInlineCaches.
+    StepInterruptPending := 1.
+    InterruptPending := 1.
+! !
+
 !MessageTracer::PrintingMessageTracer methodsFor:'trace helpers '!
 
 stepInterrupt
@@ -2880,18 +2889,9 @@
     "
 ! !
 
-!MessageTracer::InteractionCollector methodsFor:'trace helpers '!
-
-stepInterrupt
-    StepInterruptPending := nil.
-    ObjectMemory flushInlineCaches.
-    StepInterruptPending := 1.
-    InterruptPending := 1.
-! !
-
 !MessageTracer class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/MessageTracer.st,v 1.81 1999-08-04 14:08:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/MessageTracer.st,v 1.82 1999-08-04 19:34:11 cg Exp $'
 ! !
 MessageTracer initialize!