Mercurial Mercurial > hg > stx-libtool / 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.
Use access methods for oldPackage and newPackage in notifications
authorStefan Vogel <sv@exept.de>
Sun, 22 Aug 2004 19:55:00 +0200
changeset 5981 ba579d89552e
parent 5980 3b212684d2d8
child 5982 51881020b2d1
Use access methods for oldPackage and newPackage in notifications
NewSystemBrowser.st file | annotate | diff | comparison | revisions
Tools__NewSystemBrowser.st file | annotate | diff | comparison | revisions 
--- a/NewSystemBrowser.st	Sun Aug 22 19:51:22 2004 +0200
+++ b/NewSystemBrowser.st	Sun Aug 22 19:55:00 2004 +0200
@@ -34956,17 +34956,14 @@
     newSelector := self selectorOfMethodFromCode:code in:cls.
     cat := self protocolToAcceptMethod:newSelector class:cls.
 
-    Object abortSignal handle:[:ex |
+    AbortOperationRequest handle:[:ex |
 "/        self halt.
     ] do:[
         (Class methodRedefinitionSignal) handle:[:ex |
-            |answer oldVsNew oldPkg newPkg|
-
-            oldVsNew := ex parameter.
-            oldPkg := oldVsNew key package.
-            newPkg := oldVsNew value package.
-
-            answer := SystemBrowser askForPackageChangeFrom:oldPkg to:newPkg.
+            |answer|
+
+            answer := SystemBrowser askForPackageChangeFrom:ex oldPackage 
+                                                         to:ex newPackage.
 
             (answer ~~ #cancel) ifTrue:[
                 ex proceedWith:answer
@@ -35315,16 +35312,13 @@
                 ].
                 ex proceedWith:ns
             ] do:[
-                Object abortSignal catch:[
+                AbortOperationRequest catch:[
                     UndefinedObject createMinimumProtocolInNewSubclassQuery
                     answer:true
                     do:[
                         (Class classRedefinitionSignal)handle:[:ex |
-                            |answer oldVsNew oldPkg newPkg|
-
-                            oldVsNew := ex parameter.
-                            oldPkg := oldVsNew key package.
-                            newPkg := oldVsNew value package.
+                            |answer|
+
 "/ cg: now always keep the old packageID
                             Class catchClassRedefinitions ifFalse:[
                                 ex proceedWith:#keep
@@ -35335,7 +35329,7 @@
 The class is part of the ''%1'' package. 
 
 PS: you can disable this check in the launchers settings-compilation dialog.' 
-                                                      bindWith:(oldPkg allBold))
+                                                      bindWith:(ex oldPackage allBold))
 
                                           label:'Class redefinition'
                                           image:(WarningBox iconBitmap)
@@ -35930,7 +35924,7 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.770 2004-08-19 16:24:46 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.771 2004-08-22 17:55:00 stefan Exp $'
 ! !
 
 NewSystemBrowser initialize!
--- a/Tools__NewSystemBrowser.st	Sun Aug 22 19:51:22 2004 +0200
+++ b/Tools__NewSystemBrowser.st	Sun Aug 22 19:55:00 2004 +0200
@@ -34956,17 +34956,14 @@
     newSelector := self selectorOfMethodFromCode:code in:cls.
     cat := self protocolToAcceptMethod:newSelector class:cls.
 
-    Object abortSignal handle:[:ex |
+    AbortOperationRequest handle:[:ex |
 "/        self halt.
     ] do:[
         (Class methodRedefinitionSignal) handle:[:ex |
-            |answer oldVsNew oldPkg newPkg|
-
-            oldVsNew := ex parameter.
-            oldPkg := oldVsNew key package.
-            newPkg := oldVsNew value package.
-
-            answer := SystemBrowser askForPackageChangeFrom:oldPkg to:newPkg.
+            |answer|
+
+            answer := SystemBrowser askForPackageChangeFrom:ex oldPackage 
+                                                         to:ex newPackage.
 
             (answer ~~ #cancel) ifTrue:[
                 ex proceedWith:answer
@@ -35315,16 +35312,13 @@
                 ].
                 ex proceedWith:ns
             ] do:[
-                Object abortSignal catch:[
+                AbortOperationRequest catch:[
                     UndefinedObject createMinimumProtocolInNewSubclassQuery
                     answer:true
                     do:[
                         (Class classRedefinitionSignal)handle:[:ex |
-                            |answer oldVsNew oldPkg newPkg|
-
-                            oldVsNew := ex parameter.
-                            oldPkg := oldVsNew key package.
-                            newPkg := oldVsNew value package.
+                            |answer|
+
 "/ cg: now always keep the old packageID
                             Class catchClassRedefinitions ifFalse:[
                                 ex proceedWith:#keep
@@ -35335,7 +35329,7 @@
 The class is part of the ''%1'' package. 
 
 PS: you can disable this check in the launchers settings-compilation dialog.' 
-                                                      bindWith:(oldPkg allBold))
+                                                      bindWith:(ex oldPackage allBold))
 
                                           label:'Class redefinition'
                                           image:(WarningBox iconBitmap)
@@ -35930,7 +35924,7 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.770 2004-08-19 16:24:46 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.771 2004-08-22 17:55:00 stefan Exp $'
 ! !
 
 NewSystemBrowser initialize!
hg/stx-libtool