diff -r d06202b4d31c -r b7a4fff33fae NewLauncher.st --- a/NewLauncher.st Tue May 07 17:28:52 2013 +0200 +++ b/NewLauncher.st Tue May 07 17:28:54 2013 +0200 @@ -3639,95 +3639,95 @@ cvsRepository storeDB image bindings makeInfoString svnWorkDirBaseName| (Project notNil and:[(project := Project current) notNil]) ifTrue:[ - projectName := project name. - projectDir := project directory. - packageName := packageNameOrNil := project package. - defNameSpace := project defaultNameSpace. - packageNameOrNil = PackageId noProjectID ifTrue:[ - packageNameOrNil := nil - ]. + projectName := project name. + projectDir := project directory. + packageName := packageNameOrNil := project package. + defNameSpace := project defaultNameSpace. + packageNameOrNil = PackageId noProjectID ifTrue:[ + packageNameOrNil := nil + ]. ]. defNameSpace isNil ifTrue:[ - defNameSpace := Smalltalk. + defNameSpace := Smalltalk. ]. image := ((ObjectMemory imageName ? 'none') asFilename baseName). SourceCodeManager notNil ifTrue:[ - SourceCodeManager isCVS ifTrue:[ - cvsRepository := SourceCodeManager repositoryName. - (cvsRepository notNil and:[cvsRepository startsWith:':pserver:']) ifTrue:[ - cvsRepository := cvsRepository copyFrom:':pserver:'size+1. - ]. - ] ifFalse:[ - SourceCodeManager isStore ifTrue:[ - storeDB := SourceCodeManager hostAndDBName - ] - ] + SourceCodeManager isCVS ifTrue:[ + cvsRepository := SourceCodeManager repositoryName. + (cvsRepository notNil) ifTrue:[ + cvsRepository := cvsRepository withoutPrefix:':pserver:'. + ]. + ] ifFalse:[ + SourceCodeManager isStore ifTrue:[ + storeDB := SourceCodeManager hostAndDBName + ] + ] ]. makeInfoString := [:title :value | - (resources string:title) allBold - ,': ' - ,(value colorizeAllWith:(Color blue darkened)) - ,' ' - ]. + (resources string:title) allBold + ,': ' + ,(value colorizeAllWith:(Color blue darkened)) + ,' ' + ]. bindings := Dictionary new. packageName isNil ifTrue:[ - bindings at:'PACKAGE' put:''. + bindings at:'PACKAGE' put:''. ] ifFalse:[ - bindings at:'PACKAGE' put:(makeInfoString value:'Pkg' value:packageName). + bindings at:'PACKAGE' put:(makeInfoString value:'Pkg' value:packageName). ]. packageNameOrNil isNil ifTrue:[ - bindings at:'PACKAGEOREMPTY' put:''. + bindings at:'PACKAGEOREMPTY' put:''. ] ifFalse:[ - bindings at:'PACKAGEOREMPTY' put:(makeInfoString value:'Pkg' value:packageNameOrNil). + bindings at:'PACKAGEOREMPTY' put:(makeInfoString value:'Pkg' value:packageNameOrNil). ]. bindings - at:'IMAGE' - put:(makeInfoString value:'Img' value:image). + at:'IMAGE' + put:(makeInfoString value:'Img' value:image). bindings - at:'NS' put:( defNameSpace == Smalltalk - ifTrue:[ '' ] - ifFalse:[ '"',defNameSpace name,'" '] ). + at:'NS' put:( defNameSpace == Smalltalk + ifTrue:[ '' ] + ifFalse:[ '"',defNameSpace name,'" '] ). bindings - at:'PROJECTDIR' - put:(makeInfoString value:'Dir' value:(projectDir contractTo: 30)). + at:'PROJECTDIR' + put:(makeInfoString value:'Dir' value:(projectDir contractTo: 30)). cvsRepository isNil ifTrue:[ - bindings at:'CVS' put:'' + bindings at:'CVS' put:'' ] ifFalse:[ - bindings at:'CVS' put:(makeInfoString value:'CVS' value:cvsRepository). + bindings at:'CVS' put:(makeInfoString value:'CVS' value:cvsRepository). ]. storeDB isNil ifTrue:[ - bindings at:'DB' put:''. + bindings at:'DB' put:''. ] ifFalse:[ - bindings at:'DB' put:(makeInfoString value:'DB' value:storeDB). + bindings at:'DB' put:(makeInfoString value:'DB' value:storeDB). ]. (cvsRepository isNil and:[storeDB isNil]) ifTrue:[ - bindings at:'NOREPOSITORY' put:' >','No Repository'allBold,'< '. + bindings at:'NOREPOSITORY' put:' >','No Repository'allBold,'< '. ] ifFalse:[ - bindings at:'NOREPOSITORY' put:''. + bindings at:'NOREPOSITORY' put:''. ]. (SVN::RepositoryManager notNil and:[ SVN::RepositoryManager isLoaded and:[ SVN::RepositoryManager enabled ]]) - ifTrue:[ - svnWorkDirBaseName := SVN::RepositoryManager current workingCopyBase asFilename baseName. - - bindings - at: 'SVN_WORKING_COPY' - put: (makeInfoString value:'SVN Work' value:svnWorkDirBaseName). - ] ifFalse:[ - bindings - at: 'SVN_WORKING_COPY' - put: '' - ]. + ifTrue:[ + svnWorkDirBaseName := SVN::RepositoryManager current workingCopyBase asFilename baseName. + + bindings + at: 'SVN_WORKING_COPY' + put: (makeInfoString value:'SVN Work' value:svnWorkDirBaseName). + ] ifFalse:[ + bindings + at: 'SVN_WORKING_COPY' + put: '' + ]. projectInfo := self infoLineTemplate bindWithArguments:bindings. self infoLabelHolder value:projectInfo. @@ -4983,14 +4983,14 @@ !NewLauncher class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.459 2013-04-26 09:44:34 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.460 2013-05-07 15:28:54 cg Exp $' ! version_CVS - ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.459 2013-04-26 09:44:34 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.460 2013-05-07 15:28:54 cg Exp $' ! version_SVN - ^ '§Id: NewLauncher.st 7772 2011-06-08 21:59:15Z vranyj1 §' + ^ '$Id: NewLauncher.st,v 1.460 2013-05-07 15:28:54 cg Exp $' ! !