--- a/.hgtags Thu Apr 28 06:55:21 2016 +0200
+++ b/.hgtags Sat Apr 30 06:45:47 2016 +0200
@@ -1,3 +1,4 @@
+0512a94958359ab46d70b98c33ce60194f13111d expecco_2_9_0
175391e950e95ff4b4ee8e5a266932142bcdfa8f rel3_4_3_1
191e0970f4057c201caecd1b577f706087b3599c rel2_10_8_6_last2
197192cec3c79b0522e9ed3353edebbf1c15505f expecco_2_1_0
--- a/SourceCodeManagerUtilitiesForContainerBasedManagers.st Thu Apr 28 06:55:21 2016 +0200
+++ b/SourceCodeManagerUtilitiesForContainerBasedManagers.st Sat Apr 30 06:45:47 2016 +0200
@@ -472,6 +472,8 @@
askForMethodsInOtherPackages ifTrue:[
methodsInOtherPackages notEmpty ifTrue:[
+ |package2|
+
otherPackages := Set new.
methodsInOtherPackages do:[:eachMethod | otherPackages add:eachMethod package].
@@ -482,9 +484,14 @@
otherPackages size == 1 ifTrue:[
msg := 'The %1 methods from the %2 package will remain in their package.'
] ifFalse:[
- msg := 'The %1 methods from %3 other packages will remain in their packages.'
+ package2 := otherPackages second allBold.
+ otherPackages size == 2 ifTrue:[
+ msg := 'The %1 methods from %3 other packages (%2, %6) will remain in their packages.'.
+ ] ifFalse:[
+ msg := 'The %1 methods from %3 other packages (%2, %6...) will remain in their packages.'.
+ ].
].
- msg := msg , '\\Hint: if these are meant to belong to this package,'.
+ msg := msg , '\\Hint: if these are meant to belong to the %7 package,'.
msg := msg , '\move them first, then repeat the checkin operation.'.
].
msg := msg withCRs.
@@ -492,7 +499,9 @@
with:otherPackages first allBold
with:otherPackages size
with:methodsInOtherPackages first selector allBold
- with:methodsInOtherPackages first mclass name allBold.
+ with:methodsInOtherPackages first mclass name allBold
+ with:package2
+ with:packageToCheckIn.
(Dialog confirm:msg noLabel:(resources string:'Cancel')) ifFalse:[^ self].
].
].