checkin from browser
authorClaus Gittinger <cg@exept.de>
Thu, 07 Nov 1996 21:03:04 +0100
changeset 1928 f0416304f29f
parent 1927 a6c8e3b01436
child 1929 ede0e5b91a05
checkin from browser
Class.st
--- a/Class.st	Thu Nov 07 20:55:58 1996 +0100
+++ b/Class.st	Thu Nov 07 21:03:04 1996 +0100
@@ -1122,9 +1122,12 @@
                    CatchMethodRedefinitions to false
                  (also found in the Launchers 'settings-misc' menu)
                 "
-                MethodRedefinitionSignal
+                (MethodRedefinitionSignal
                     raiseRequestWith:(oldMethod -> newMethod)
                     errorString:('redefinition of ' , name , '>>' , newSelector) 
+                ) == #keep ifTrue:[
+                    newMethod package:oldMethod package
+                ].
 
                 "/ if proceeded, install as usual.
             ]
@@ -1145,7 +1148,7 @@
 
     "Created: 29.10.1995 / 19:42:42 / cg"
     "Modified: 9.9.1996 / 22:39:32 / stefan"
-    "Modified: 7.11.1996 / 20:50:03 / cg"
+    "Modified: 7.11.1996 / 21:00:56 / cg"
 !
 
 basicAddSelector:newSelector withMethod:newMethod
@@ -4348,19 +4351,27 @@
 "/    newString := mgr updatedRevisionStringOf:cls forRevision:newRevision with:vs. 
 "/    newString isNil ifTrue:[^ false].
 
-    Class withoutUpdatingChangesDo:[
-        Compiler compile:'version
+    MethodRedefinitionSignal handle:[:ex |
+        ex proceedWith:#keep 
+    ] do:[
+        Class withoutUpdatingChangesDo:[
+            Compiler compile:'version
     ^ ''' , newRevisionString , '''
 '
-                 forClass:cls inCategory:#documentation notifying:nil 
-                     install:true skipIfSame:false silent:true. 
+                     forClass:cls 
+                     inCategory:#documentation 
+                     notifying:nil 
+                     install:true 
+                     skipIfSame:false 
+                     silent:true. 
+        ]
     ].
 "/ ('updated to :' , newRevisionString) printNL.
 
     ^ true
 
     "Created: 7.12.1995 / 20:42:22 / cg"
-    "Modified: 15.10.1996 / 18:59:58 / cg"
+    "Modified: 7.11.1996 / 21:02:09 / cg"
 !
 
 validateSourceStream:aStream
@@ -4450,6 +4461,6 @@
 !Class class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.210 1996-11-07 19:55:58 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.211 1996-11-07 20:03:04 cg Exp $'
 ! !
 Class initialize!