Mercurial Mercurial > hg > stx-libbasic / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
checkin from browser
authorClaus Gittinger <cg@exept.de>
Tue, 29 Jun 1999 12:20:25 +0200
changeset 4325 a342aa8ff8c7
parent 4324 9b4b8ace862d
child 4326 9b1d4f1bf719
checkin from browser
PosStream.st file | annotate | diff | comparison | revisions
PositionableStream.st file | annotate | diff | comparison | revisions 
--- a/PosStream.st	Mon Jun 28 21:59:38 1999 +0200
+++ b/PosStream.st	Tue Jun 29 12:20:25 1999 +0200
@@ -512,7 +512,7 @@
     handledSignals add:(Class classRedefinitionSignal).
     handledSignals add:confirmationQuerySignal.
     handledSignals handle:[:ex |
-        |sig action what sender msg param oldPackage newPackage|
+        |sig action what sender msg param oldPackage newPackage proceedValue|
 
         sig := ex signal.
         sig == changeDefaultApplicationNotificationSignal ifTrue:[
@@ -559,14 +559,16 @@
             oldPackage := param key package.
             newPackage := param value package.
             msg := 'trying to overwrite method:\\    %1\\in package ''' 
-                   , oldPackage , ''' with method from package ''' , newPackage , ''''
+                   , oldPackage , ''' with method from package ''' , newPackage , ''''.
+            proceedValue := #keep.
         ] ifFalse:[
             (sig == Class classRedefinitionSignal) ifTrue:[
                 param := ex parameter. "/ an association: oldClass -> newClass
                 oldPackage := param key package.
                 newPackage := param value package.
                 msg := 'trying to redefine class:\\    %1\\in package ''' 
-                       , oldPackage , ''' with new definition from package ''' , newPackage , ''''
+                       , oldPackage , ''' with new definition from package ''' , newPackage , ''''.
+                proceedValue := #keep.
             ] ifFalse:[
                 msg := 'error in fileIn: %1'
             ]
@@ -600,7 +602,11 @@
 
         action := self askForDebug:msg withCRs.
         action == #continue ifTrue:[
-            ex proceed
+            proceedValue notNil ifTrue:[
+                ex proceedWith:proceedValue
+            ] ifFalse:[
+                ex proceed
+            ]
         ].
         action == #abort ifTrue:[
             AbortSignal raise.
@@ -866,6 +872,6 @@
 !PositionableStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Attic/PosStream.st,v 1.73 1999-04-23 17:24:50 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Attic/PosStream.st,v 1.74 1999-06-29 10:20:25 cg Exp $'
 ! !
 PositionableStream initialize!
--- a/PositionableStream.st	Mon Jun 28 21:59:38 1999 +0200
+++ b/PositionableStream.st	Tue Jun 29 12:20:25 1999 +0200
@@ -512,7 +512,7 @@
     handledSignals add:(Class classRedefinitionSignal).
     handledSignals add:confirmationQuerySignal.
     handledSignals handle:[:ex |
-        |sig action what sender msg param oldPackage newPackage|
+        |sig action what sender msg param oldPackage newPackage proceedValue|
 
         sig := ex signal.
         sig == changeDefaultApplicationNotificationSignal ifTrue:[
@@ -559,14 +559,16 @@
             oldPackage := param key package.
             newPackage := param value package.
             msg := 'trying to overwrite method:\\    %1\\in package ''' 
-                   , oldPackage , ''' with method from package ''' , newPackage , ''''
+                   , oldPackage , ''' with method from package ''' , newPackage , ''''.
+            proceedValue := #keep.
         ] ifFalse:[
             (sig == Class classRedefinitionSignal) ifTrue:[
                 param := ex parameter. "/ an association: oldClass -> newClass
                 oldPackage := param key package.
                 newPackage := param value package.
                 msg := 'trying to redefine class:\\    %1\\in package ''' 
-                       , oldPackage , ''' with new definition from package ''' , newPackage , ''''
+                       , oldPackage , ''' with new definition from package ''' , newPackage , ''''.
+                proceedValue := #keep.
             ] ifFalse:[
                 msg := 'error in fileIn: %1'
             ]
@@ -600,7 +602,11 @@
 
         action := self askForDebug:msg withCRs.
         action == #continue ifTrue:[
-            ex proceed
+            proceedValue notNil ifTrue:[
+                ex proceedWith:proceedValue
+            ] ifFalse:[
+                ex proceed
+            ]
         ].
         action == #abort ifTrue:[
             AbortSignal raise.
@@ -866,6 +872,6 @@
 !PositionableStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/PositionableStream.st,v 1.73 1999-04-23 17:24:50 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/PositionableStream.st,v 1.74 1999-06-29 10:20:25 cg Exp $'
 ! !
 PositionableStream initialize!
hg/stx-libbasic