--- a/SourceCodeManagerUtilities.st Fri Mar 29 19:43:35 2013 +0000
+++ b/SourceCodeManagerUtilities.st Mon Apr 01 14:07:13 2013 +0100
@@ -52,6 +52,7 @@
"
! !
+
!SourceCodeManagerUtilities class methodsFor:'instance creation'!
forManager: aSourceCodeManager
@@ -72,6 +73,7 @@
"Modified: / 25-07-2012 / 17:10:55 / cg"
! !
+
!SourceCodeManagerUtilities class methodsFor:'Signal constants'!
yesToAllNotification
@@ -88,6 +90,7 @@
^ YesToAllQuery
! !
+
!SourceCodeManagerUtilities class methodsFor:'accessing'!
default
@@ -123,6 +126,7 @@
LastPackage := something.
! !
+
!SourceCodeManagerUtilities class methodsFor:'error handling'!
doesNotUnderstand: aMessage
@@ -140,6 +144,7 @@
"Created: / 10-10-2011 / 14:04:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+
!SourceCodeManagerUtilities class methodsFor:'private-migration'!
compileForwarders
@@ -174,12 +179,14 @@
"Created: / 11-10-2011 / 10:55:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+
!SourceCodeManagerUtilities class methodsFor:'resources'!
resourcePackage
^ #'stx:libtool'
! !
+
!SourceCodeManagerUtilities class methodsFor:'utilities'!
classIsNotYetInRepository:aClass withManager:mgr
@@ -249,6 +256,7 @@
^self default versionString:a isLessThan:b
! !
+
!SourceCodeManagerUtilities class methodsFor:'utilities-cvs'!
changeSetForExtensionMethodsForPackage:packageToCheckOut askForRevision:askForRevision usingManager:aSourceCodeManager
@@ -559,6 +567,7 @@
"Created: / 29-12-2011 / 14:31:43 / cg"
! !
+
!SourceCodeManagerUtilities class methodsFor:'utilities-cvs-helpers'!
getMethodVersionsOfClass:aClass selector:selector numberOfRevisions:numberOfRevisionsOrNil
@@ -570,6 +579,7 @@
^self default getMethodVersionsOfClass:aClass selector:selector numberOfRevisions:numberOfRevisionsOrNil
! !
+
!SourceCodeManagerUtilities class methodsFor:'utilities-cvs-user interaction'!
askForContainer:boxText title:title note:notice initialModule:initialModule initialPackage:initialPackage initialFileName:initialFileName
@@ -643,6 +653,7 @@
^self default goodInitialLogMessageForCheckinClassOfClass:aClass
! !
+
!SourceCodeManagerUtilities class methodsFor:'utilities-encoding'!
guessEncodingOfFile:aFilename
@@ -661,6 +672,7 @@
^ CharacterEncoder guessEncodingOfStream:aStream
! !
+
!SourceCodeManagerUtilities methodsFor:'accessing'!
classResources
@@ -704,6 +716,7 @@
"Created: / 11-10-2011 / 12:01:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+
!SourceCodeManagerUtilities methodsFor:'error handling'!
doesNotUnderstand: aMessage
@@ -721,6 +734,7 @@
"Created: / 10-10-2011 / 14:02:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+
!SourceCodeManagerUtilities methodsFor:'initialization'!
initialize
@@ -744,6 +758,7 @@
"Modified: / 25-07-2012 / 08:35:35 / cg"
! !
+
!SourceCodeManagerUtilities methodsFor:'utilities'!
classIsNotYetInRepository:aClass withManager:mgr
@@ -906,15 +921,15 @@
!
validateConsistencyOfPackage:aPackage doClasses:doClasses doExtensions:doExtensions
- |checker defClass report msg answer dialog|
-
- defClass := aPackage asPackageId projectDefinitionClass.
- "/ also done by ProjectChecker
+ |checker report msg answer dialog|
+
+ "/ also done by ProjectChecker...
+ "/ defClass := aPackage asPackageId projectDefinitionClass.
"/ defClass validateDescription.
checker := ProjectChecker new.
checker checkExtensionsOnly:(doClasses not and:[ doExtensions ]).
- report := checker check: defClass package.
+ report := checker check: aPackage.
(report notNil and:[report problems notEmptyOrNil]) ifTrue:[
report problems size == 1 ifTrue:[
msg := 'The ProblemChecker found the following error/inconsistency:\\ %2\\Need more detail or help for repair?'
@@ -930,11 +945,11 @@
answer == true ifTrue:[
dialog := Tools::ProjectCheckerBrowser new.
dialog
- projectChecker: (ProjectChecker forPackage: defClass package);
+ projectChecker: (ProjectChecker forPackage: aPackage);
problemList:report problems;
showCancel:true;
openModal.
-self halt.
+
dialog accepted ifFalse:[
AbortSignal raiseRequest
].
@@ -988,6 +1003,7 @@
"Modified: / 17-02-2011 / 10:20:14 / cg"
! !
+
!SourceCodeManagerUtilities methodsFor:'utilities-cvs'!
changeSetForExtensionMethodsForPackage:packageToCheckOut askForRevision:askForRevision usingManager:aSourceCodeManager
@@ -2428,14 +2444,15 @@
aClass instAndClassSelectorsAndMethodsDo:[:sel :mthd | mthd setPackage:requiredPackage].
aClass package:requiredPackage.
- (mgr
+ [ mgr
createContainerFor:aClass
inModule:module
package:directory
container:fileName
- ) ifFalse:[
- self warn:(resources string:'Failed to create container.').
- ^ false.
+ ] whileFalse:[
+ (Dialog confirm:(resources stringWithCRs:'Failed to create container.\(fix your setup then retry, or cancel)\\Retry?') yesLabel:'Retry') ifFalse:[
+ ^ false.
+ ].
].
^ true
@@ -3041,6 +3058,7 @@
"Created: / 29-12-2011 / 14:32:38 / cg"
! !
+
!SourceCodeManagerUtilities methodsFor:'utilities-cvs-helpers'!
getMethodVersionsOfClass:aClass selector:selector numberOfRevisions:numberOfRevisionsOrNil
@@ -3117,6 +3135,7 @@
"
! !
+
!SourceCodeManagerUtilities methodsFor:'utilities-cvs-user interaction'!
askForContainer:boxText title:title note:notice initialModule:initialModule initialPackage:initialPackage initialFileName:initialFileName
@@ -3851,6 +3870,7 @@
"Modified: / 26-09-2012 / 18:31:38 / cg"
! !
+
!SourceCodeManagerUtilities methodsFor:'utilities-encoding'!
guessEncodingOfFile:aFilename
@@ -3888,14 +3908,15 @@
^ CharacterEncoder guessEncodingOfStream:aStream
! !
+
!SourceCodeManagerUtilities class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.268 2013-03-27 19:36:57 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.269 2013-03-28 10:48:26 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.268 2013-03-27 19:36:57 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.269 2013-03-28 10:48:26 cg Exp $'
!
version_HG