checkin from browser
authorClaus Gittinger <cg@exept.de>
Mon, 04 Dec 2000 22:32:13 +0100
changeset 1021 0448114aab01
parent 1020 8f996d8e2b57
child 1022 139e278b0f03
checkin from browser
AbstractSourceCodeManager.st
--- a/AbstractSourceCodeManager.st	Mon Dec 04 12:28:45 2000 +0100
+++ b/AbstractSourceCodeManager.st	Mon Dec 04 22:32:13 2000 +0100
@@ -401,7 +401,7 @@
         #base   - only check in methods from the classes package
         #all    - check in all"
 
-    |checkInClassPackageOnly clsPackage otherPackages methodsFromOtherPackages msg answer|
+    |checkInClassPackageOnly clsPackage otherPackages methodsFromOtherPackages msg answer isDefaultAnswer|
 
     checkInClassPackageOnly := false.
 
@@ -421,8 +421,9 @@
         ^ #all
     ].
 
+    isDefaultAnswer := false.
     (SourceCodeManagerUtilities yesToAllNotification notNil and:[SourceCodeManagerUtilities yesToAllNotification isHandled]) ifTrue:[
-        answer := true.
+        answer := isDefaultAnswer := true.
     ] ifFalse:[
         msg := 'The class ''' , aClass name allBold.
         otherPackages size == 1 ifTrue:[
@@ -452,8 +453,29 @@
     answer == true ifTrue:[
         ((otherPackages size > 1)
         or:[otherPackages first ~= Project defaultProject package]) ifTrue:[
-            (self confirm:('Are you certain to check the other packages methods into the %1 package ?'
-                          bindWith:clsPackage)) ifFalse:[
+            isDefaultAnswer ifFalse:[
+                msg := ''
+            ] ifTrue:[
+                msg := 'The %1 class contains methods from '.
+                otherPackages size == 1 ifTrue:[
+                    msg := msg , 'the %3 package.'.
+                ] ifFalse:[
+                    otherPackages size == 1 ifTrue:[
+                        msg := msg , 'the %3 and the %4 packages.'.
+                    ] ifFalse:[
+                        msg := msg , '%2 other packages.'.
+                    ]
+                ].
+            ].
+            msg := msg , '\\Are you certain to check the other packages methods with the class into the %5 package ?'.
+            msg := msg 
+                        bindWith:aClass name
+                        with:otherPackages size printString
+                        with:(otherPackages at:1 ifAbsent:'')
+                        with:(otherPackages at:2 ifAbsent:'')
+                        with:clsPackage.
+
+            (self confirm:msg) ifFalse:[
                 AbortSignal raise
             ]
         ].
@@ -1903,6 +1925,6 @@
 !AbstractSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.133 2000-12-01 15:29:46 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.134 2000-12-04 21:32:13 cg Exp $'
 ! !
 AbstractSourceCodeManager initialize!