--- a/SourceCodeManagerUtilitiesForContainerBasedManagers.st Sun Jun 01 12:29:38 2014 +0200
+++ b/SourceCodeManagerUtilitiesForContainerBasedManagers.st Tue Jun 03 11:04:25 2014 +0200
@@ -37,7 +37,7 @@
!SourceCodeManagerUtilitiesForContainerBasedManagers methodsFor:'utilities-cvs'!
checkinBuildSupportFilesForPackage:packageID withInfo:checkinInfo
- |anyFailure module directory mgr defClass |
+ |anyFailure module directory mgr defClass|
mgr := self sourceCodeManagerFor: packageID.
defClass := ProjectDefinition definitionClassForPackage: packageID.
@@ -81,23 +81,27 @@
mgr createModule:module directory:realDirectory
].
].
- (mgr
- createContainerForText:fileContents
- inModule:module
- package:realDirectory
- container:realFileName)
- ifFalse:[
- (Dialog
- confirm:(resources
- stringWithCRs:'Cannot create new container: ''%3'' (in %1:%2).\\Proceed?'
- with:module
- with:realDirectory
- with:realFileName)
- noLabel:'Cancel')
- ifFalse:[
- AbortOperationRequest raise
- ]
- ].
+ [:exit |
+ |answer|
+
+ (mgr
+ createContainerForText:fileContents
+ inModule:module
+ package:realDirectory
+ container:realFileName) ifTrue:[ exit value:nil ].
+
+ answer := Dialog
+ confirmWithCancel:(resources
+ stringWithCRs:'Cannot create new container: ''%3'' (in %1:%2).\\Retry?'
+ with:module
+ with:realDirectory
+ with:realFileName).
+
+ answer == nil ifTrue:[
+ AbortOperationRequest raise
+ ].
+ answer == false ifTrue:[ exit value:nil ].
+ ] loopWithExit.
] ifFalse:[
(mgr
checkin:realFileName
@@ -843,10 +847,10 @@
!SourceCodeManagerUtilitiesForContainerBasedManagers class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.20 2014-04-04 20:20:01 vrany Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.21 2014-06-03 09:04:25 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.20 2014-04-04 20:20:01 vrany Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.21 2014-06-03 09:04:25 cg Exp $'
! !