--- a/AbstractFileBrowser.st Tue Oct 06 12:42:44 2009 +0200
+++ b/AbstractFileBrowser.st Tue Oct 06 12:49:04 2009 +0200
@@ -6577,17 +6577,20 @@
msg := msg bindWith:ex description.
+ labels := #('Cancel' 'Skip' 'Debug' 'Compare Sources').
+ values := #(abort skip debug compareSources).
+
isRedef ifTrue:[
msg := msg, ('%<cr>%<cr>Continue will install the change and assign the %1 to the new package.
Keep Package will install the change, but keep the %1 in the old package.' bindWith:redefKind).
- labels := #('Cancel' 'Skip' 'Debug' 'Keep Package' 'Continue' 'ContinueForAll').
- values := #(abort skip debug keep continue continueForAll).
- ] ifFalse:[
- labels := #('Cancel' 'Skip' 'Debug' 'Continue').
- values := #(abort skip debug continue).
+ labels := labels , #('Keep Package' ).
+ values := values , #(keep).
].
+ labels := labels , #( 'Continue' 'ContinueForAll').
+ values := values , #( continue continueForAll).
+
AbortAllOperationRequest isHandled ifTrue:[
labels := #('Cancel All') , labels.
values := #(cancelAll) , values.
@@ -6610,6 +6613,13 @@
action := #continue.
].
+ (action == #compareSources) ifTrue:[
+ DiffCodeView
+ openOn:(ex oldMethod source) label:'Old Source'
+ and:(ex newMethod source) label:'New Source'
+ title:ex description.
+ ex resignalAs:ex
+ ].
(action == #continue or:[action == #keep]) ifTrue:[
ex proceedWith:action "(isRedef ifTrue:[#keep] ifFalse:[#continue])".
].
@@ -7840,9 +7850,9 @@
!AbstractFileBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.415 2009-10-06 08:30:34 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.416 2009-10-06 10:49:04 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.415 2009-10-06 08:30:34 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.416 2009-10-06 10:49:04 cg Exp $'
! !