--- a/AbstractSourceCodeManager.st Thu Oct 04 19:26:38 2001 +0200
+++ b/AbstractSourceCodeManager.st Mon Oct 08 11:19:31 2001 +0200
@@ -408,7 +408,7 @@
otherPackages := Set new.
methodsFromOtherPackages := IdentitySet new.
- aClass allSelectorsAndMethodsDo:[:sel :mthd |
+ aClass instAndClassSelectorsAndMethodsDo:[:sel :mthd |
|mthdPackage|
(mthdPackage := mthd package) ~= clsPackage ifTrue:[
@@ -419,7 +419,7 @@
otherPackages isEmpty ifTrue:[
aClass allPrivateClassesDo:[:eachPrivateClass |
aClass setPackage:clsPackage.
- eachPrivateClass allSelectorsAndMethodsDo:[:sel :mthd |
+ eachPrivateClass instAndClassSelectorsAndMethodsDo:[:sel :mthd |
mthd setPackage:clsPackage
]
].
@@ -433,7 +433,8 @@
].
isDefaultAnswer := false.
- (SourceCodeManagerUtilities yesToAllNotification notNil and:[SourceCodeManagerUtilities yesToAllNotification isHandled]) ifTrue:[
+ (SourceCodeManagerUtilities yesToAllNotification notNil
+ and:[SourceCodeManagerUtilities yesToAllNotification isHandled]) ifTrue:[
answer := isDefaultAnswer := true.
] ifFalse:[
defaultAnswer := false.
@@ -445,7 +446,7 @@
msg := msg , ''' contains %4 method(s) for %2 other packages'.
].
methodCategoriesInOtherPackages size == 1 ifTrue:[
- msg := msg , ' (category: ''%5'').'.
+ msg := msg , ' (in category: ''%5'').'.
] ifFalse:[
msg := msg , ' (in %6 categories).'.
].
@@ -453,11 +454,11 @@
SourceCodeManagerUtilities yesToAllNotification isHandled
ifTrue:[
- labels := #('Cancel' 'No' 'Yes to all' 'Yes').
- actions := #(nil false #yesToAll true).
+ labels := #('Cancel' 'No' 'Browse' 'Yes to all' 'Yes').
+ actions := #(nil false #browse #yesToAll true).
] ifFalse:[
- labels := #('Cancel' 'No' 'Yes').
- actions := #(nil false true).
+ labels := #('Cancel' 'No' 'Browse' 'Yes').
+ actions := #(nil false #browse true).
].
answer := OptionBox
@@ -473,6 +474,14 @@
buttonLabels:labels
values:actions
default:defaultAnswer.
+
+ answer == #browse ifTrue:[
+ NewSystemBrowser
+ browseMethods:methodsFromOtherPackages
+ title:('Extensions in %1' bindWith:aClass name)
+ sort:true.
+ AbortSignal raise
+ ].
].
answer == #yesToAll ifTrue:[
@@ -511,12 +520,12 @@
].
"/ change all method's packageID to the classes packageId
- aClass allSelectorsAndMethodsDo:[:sel :mthd |
+ aClass instAndClassSelectorsAndMethodsDo:[:sel :mthd |
mthd setPackage:clsPackage
].
aClass allPrivateClassesDo:[:eachPrivateClass |
aClass setPackage:clsPackage.
- eachPrivateClass allSelectorsAndMethodsDo:[:sel :mthd |
+ eachPrivateClass instAndClassSelectorsAndMethodsDo:[:sel :mthd |
mthd setPackage:clsPackage
]
].
@@ -1982,6 +1991,6 @@
!AbstractSourceCodeManager class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.146 2001-09-28 14:29:53 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.147 2001-10-08 09:19:31 cg Exp $'
! !
AbstractSourceCodeManager initialize!
--- a/SourceCodeManagerUtilities.st Thu Oct 04 19:26:38 2001 +0200
+++ b/SourceCodeManagerUtilities.st Mon Oct 08 11:19:31 2001 +0200
@@ -389,7 +389,7 @@
).
whatIsBad := Set new.
- aClass theNonMetaclass allSelectorsAndMethodsDo:[:sel :mthd |
+ aClass theNonMetaclass instAndClassSelectorsAndMethodsDo:[:sel :mthd |
|setOfLiterals setOfSentMessages|
setOfLiterals := mthd literals. "/ try without parsing first.
@@ -1431,7 +1431,7 @@
"/ ^ false
"/ ]
"/ ].
- aClass allSelectorsAndMethodsDo:[:sel :mthd | mthd setPackage:requiredPackage].
+ aClass instAndClassSelectorsAndMethodsDo:[:sel :mthd | mthd setPackage:requiredPackage].
aClass package:requiredPackage.
aClass changed:#projectOrganization.
Smalltalk changed:#projectOrganization with:(Array with:aClass).
@@ -1934,7 +1934,7 @@
anyChange := false.
aClass withAllPrivateClassesDo:[:eachClass |
anyChangeHere := false.
- eachClass allSelectorsAndMethodsDo:[:sel :mthd |
+ eachClass instAndClassSelectorsAndMethodsDo:[:sel :mthd |
mthd package ~= aPackage ifTrue:[
mthd setPackage:aPackage.
anyChangeHere := true.
@@ -1954,5 +1954,5 @@
!SourceCodeManagerUtilities class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.65 2001-10-04 17:26:38 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.66 2001-10-08 09:19:29 cg Exp $'
! !