--- a/ChangeSetBrowser.st	Tue Oct 07 16:24:33 2008 +0200
+++ b/ChangeSetBrowser.st	Tue Oct 07 16:24:44 2008 +0200
@@ -676,9 +676,9 @@
     aborted := false.
 
     applyAction := [
-        AbortOperationRequest handle:[:ex |
-            aborted := true.
-        ] do:[
+"/        AbortOperationRequest handle:[:ex |
+"/            ^ false.
+"/        ] do:[
             Parser::ParseError handle:[:ex |       
                 ex signal == Parser::UndefinedSuperclassError ifTrue:[
                     codeView error:(ex errorString) position:1 to:nil from:nil 
@@ -690,7 +690,11 @@
 
                 change := changeSet at:changeNr.
                 nameSpace := self nameSpaceForApply.
-                package := enforcedPackage ? change package ? Class packageQuerySignal query.             
+                change isDoIt ifTrue:[
+                    package := enforcedPackage ? Class packageQuerySignal query.             
+                ] ifFalse:[  
+                    package := enforcedPackage ? change package ? Class packageQuerySignal query.             
+                ].
 
                 Class packageQuerySignal answer:package
                 do:[    
@@ -699,7 +703,7 @@
                         self applyPossiblyModifiedChange:change.
                     ]
                 ]
-            ]
+"/            ]
         ].
         changeNrProcessed := nil.
     ].
@@ -751,7 +755,7 @@
                             requestClass:'No superclass: ', superClassName allBold , ' enter a replacement:' 
                             initialAnswer:(guess ? superClassName).
 
-                superClass isNil ifTrue:[^ self ].
+                superClass isNil ifTrue:[AbortOperationRequest raise. ^ self ].
             ].
             
             superClass notNil ifTrue:[
@@ -1003,5 +1007,5 @@
 !ChangeSetBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/ChangeSetBrowser.st,v 1.49 2007-04-04 17:02:24 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ChangeSetBrowser.st,v 1.50 2008-10-07 14:24:44 cg Exp $'
 ! !