--- a/ChangeSetBrowser.st	Tue Jun 17 16:54:21 2003 +0200
+++ b/ChangeSetBrowser.st	Wed Jun 18 17:31:58 2003 +0200
@@ -644,7 +644,7 @@
 applyChange:changeNr
     "fileIn a change"
 
-    |nm applyAction|
+    |nm applyAction aborted|
 
     nm := self classNameOfChange:changeNr.
     nm notNil ifTrue:[
@@ -659,6 +659,7 @@
     ].
 
     changeNrProcessed := changeNr.
+    aborted := false.
 
     applyAction := [
         |sig|
@@ -666,15 +667,16 @@
         (skipSignal notNil) ifTrue:[
             sig := skipSignal
         ] ifFalse:[
-            sig := Object abortSignal
+            sig := AbortOperationRequest
         ].
-        sig catch:[
-
+        sig handle:[:ex |
+            aborted := (sig == AbortOperationRequest).
+        ] do:[
             Parser::ParseError handle:[:ex |       
                 ex signal == Parser::UndefinedSuperclassError ifTrue:[
                     codeView error:(ex errorString) position:1 to:nil from:nil 
                 ] ifFalse:[
-                    codeView error:(ex errorMessage) position:(ex startPosition) to:(ex endPosition) from:(ex parser) 
+                    codeView error:(ex description) position:(ex startPosition) to:(ex endPosition) from:(ex parser) 
                 ]
             ] do:[
                 |nameSpace pkg|
@@ -701,6 +703,7 @@
     ] ifFalse:[
         applyAction value
     ].
+    ^ aborted not
 
     "Created: / 7.2.1998 / 19:32:35 / cg"
     "Modified: / 7.2.1998 / 19:35:11 / cg"
@@ -867,7 +870,7 @@
 streamForChange:changeNr
     "answer a stream for change"
 
-    |change str|
+    |change str source|
 
     change := changeSet at:changeNr.
     change isNil ifTrue:[^nil].
@@ -882,9 +885,11 @@
         str space.
         str nextPutChunkSeparator.
         str cr.
-        ^ ReadStream on:str contents
+        source := str contents
+    ] ifFalse:[
+        source := change source
     ].
-    ^ ReadStream on:(change source)
+    ^ ReadStream on:source
 
     "Modified: / 7.2.1998 / 19:52:44 / cg"
 ! !
@@ -942,5 +947,5 @@
 !ChangeSetBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/ChangeSetBrowser.st,v 1.34 2003-06-03 16:23:37 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ChangeSetBrowser.st,v 1.35 2003-06-18 15:31:58 cg Exp $'
 ! !