class: SourceCodeManagerUtilitiesForContainerBasedManagers
authorClaus Gittinger <cg@exept.de>
Fri, 28 Nov 2014 17:09:01 +0100
changeset 3651 d58c178282c0
parent 3650 55efda927113
child 3652 6c973456571b
class: SourceCodeManagerUtilitiesForContainerBasedManagers changed: #checkinPackage:classes:extensions:buildSupport:askForMethodsInOtherPackages: just a message string change
SourceCodeManagerUtilitiesForContainerBasedManagers.st
--- a/SourceCodeManagerUtilitiesForContainerBasedManagers.st	Fri Nov 28 17:02:24 2014 +0100
+++ b/SourceCodeManagerUtilitiesForContainerBasedManagers.st	Fri Nov 28 17:09:01 2014 +0100
@@ -326,9 +326,9 @@
                 methodsInPrjDef := methodsInPrjDef reject:[:m | m isNil].
                 methodsInPrjDef asSet ~= methodsToCheckIn asSet ifTrue:[
                     answer:= Dialog 
-                        confirmWithCancel:('Set of methods in image is different from what is specified in the project definition.\Check in image methods (%1) or definition methods (%2)?'
+                        confirmWithCancel:('The set of methods in image is different from what is specified in the project definition.\You should probably make sure that all extension methods are all associated to the correct package.\\Check in image methods (%1) or definition methods (%2)?'
                                         bindWith: methodsToCheckIn size
-                                        with: methodsInPrjDef size)
+                                        with: methodsInPrjDef size) withCRs
                         labels:#('Image Methods' 'Definition Methods' 'Cancel') 
                         values:#(true false nil) 
                         default:nil.
@@ -456,7 +456,7 @@
                 msg := msg , '\\This method will remain in its package.'.
             ] ifFalse:[
                 otherPackages size == 1 ifTrue:[
-                    msg := 'The %1 methods from the %2 package will remain in its package.'
+                    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.'
                 ].
@@ -569,10 +569,10 @@
 !SourceCodeManagerUtilitiesForContainerBasedManagers class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.22 2014-07-21 11:27:25 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.23 2014-11-28 16:09:01 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.22 2014-07-21 11:27:25 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.23 2014-11-28 16:09:01 cg Exp $'
 ! !