--- a/BrowserView.st Thu Aug 19 18:24:46 2004 +0200
+++ b/BrowserView.st Sun Aug 22 19:51:22 2004 +0200
@@ -12930,12 +12930,9 @@
UndefinedObject createMinimumProtocolInNewSubclassQuery
answer:true
do:[
- (Class classRedefinitionSignal)handle:[:ex |
- |answer oldVsNew oldPkg newPkg|
-
- oldVsNew := ex parameter.
- oldPkg := oldVsNew key package.
- newPkg := oldVsNew value package.
+ (Class classRedefinitionSignal) handle:[:ex |
+ |answer|
+
"/ cg: now always keep the old packageID
answer := OptionBox
request:
@@ -12943,7 +12940,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)
@@ -13139,13 +13136,10 @@
lockUpdates := true.
(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
]
@@ -14636,7 +14630,7 @@
!BrowserView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/BrowserView.st,v 1.779 2004-07-16 12:23:08 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/BrowserView.st,v 1.780 2004-08-22 17:51:22 stefan Exp $'
! !
BrowserView initialize!