# HG changeset patch # User Claus Gittinger # Date 1297280439 -3600 # Node ID 7ca7e8c0a28e03454e22f08bb04db37f787caec4 # Parent 995ecd40d3bad5c72c68fafeb0d171d818e20de2 format diff -r 995ecd40d3ba -r 7ca7e8c0a28e AbstractLauncherApplication.st --- a/AbstractLauncherApplication.st Wed Feb 09 14:04:51 2011 +0100 +++ b/AbstractLauncherApplication.st Wed Feb 09 20:40:39 2011 +0100 @@ -4393,30 +4393,30 @@ changeFileName := ObjectMemory nameForChanges asValue. AbstractSourceCodeManager notNil ifTrue:[ - AbstractSourceCodeManager autoload. + AbstractSourceCodeManager autoload. ]. hasManager := AbstractSourceCodeManager notNil - and:[AbstractSourceCodeManager isLoaded]. + and:[AbstractSourceCodeManager isLoaded]. repositoryHolder := '' asValue. hasManager ifTrue:[ - useManager := (manager := Smalltalk at:#SourceCodeManager) notNil asValue. - localSourceFirst := Class tryLocalSourceFirst asValue. - manager notNil ifTrue:[ - manager forgetDisabledModules. - repository := manager repositoryName. - repository notNil ifTrue:[ - repositoryHolder := repository asValue. - ] ifFalse:[ - repositoryHolder := '' asValue. - ]. - ]. - cvsIsSetup := true. + useManager := (manager := Smalltalk at:#SourceCodeManager) notNil asValue. + localSourceFirst := Class tryLocalSourceFirst asValue. + manager notNil ifTrue:[ + manager forgetDisabledModules. + repository := manager repositoryName. + repository notNil ifTrue:[ + repositoryHolder := repository asValue. + ] ifFalse:[ + repositoryHolder := '' asValue. + ]. + ]. + cvsIsSetup := true. ] ifFalse:[ - useManager := false. - localSourceFirst := false. - cvsIsSetup := false. + useManager := false. + localSourceFirst := false. + cvsIsSetup := false. ]. cvsIsSetup := cvsIsSetup asValue. showErrorNotifier := (NoHandlerError emergencyHandler == AbstractLauncherApplication notifyingEmergencyHandler) asValue. @@ -4438,11 +4438,11 @@ box addCheckBox:(resources string:'Log doIts in Changefile') on:logDoits. component := box - addLabelledInputField:(resources string:'Changefile Name:') - adjust:#right - on:changeFileName - tabable:true - separateAtX:0.4. + addLabelledInputField:(resources string:'Changefile Name:') + adjust:#right + on:changeFileName + tabable:true + separateAtX:0.4. component immediateAccept:true; acceptOnLeave:false. "/ y := box yPosition. @@ -4455,33 +4455,33 @@ box addHorizontalLine. hasManager ifTrue:[ - pos := box yPosition. - check := box addCheckBox:(resources string:'Sourcecode Management') on:useManager. - check enableChannel:cvsIsSetup. - box makeTabable:check. - - CVSSourceCodeManager notNil ifTrue:[ - check width:0.6. - box yPosition:pos. - setupButt := box addComponent:(Button label:(resources string:'Setup...') - action:[|manager| - - self cvsConfigurationDialog. - manager := (Smalltalk at:#SourceCodeManager). - cvsIsSetup value:manager notNil. - manager notNil ifTrue:[ - repositoryHolder value: manager repositoryName. - sourceCacheDir value:(AbstractSourceCodeManager cacheDirectoryName). - ]. - ]). - setupButt enableChannel:useManager. - box makeTabable:setupButt. - setupButt left:0.6; width:0.4. - ]. - oldIndent := box leftIndent. - box leftIndent:30. - - box addVerticalSpace:10. + pos := box yPosition. + check := box addCheckBox:(resources string:'Sourcecode Management') on:useManager. + check enableChannel:cvsIsSetup. + box makeTabable:check. + + CVSSourceCodeManager notNil ifTrue:[ + check width:0.6. + box yPosition:pos. + setupButt := box addComponent:(Button label:(resources string:'Setup...') + action:[|manager| + + self cvsConfigurationDialog. + manager := (Smalltalk at:#SourceCodeManager). + cvsIsSetup value:manager notNil. + manager notNil ifTrue:[ + repositoryHolder value: manager repositoryName. + sourceCacheDir value:(AbstractSourceCodeManager cacheDirectoryName). + ]. + ]). + setupButt enableChannel:useManager. + box makeTabable:setupButt. + setupButt left:0.6; width:0.4. + ]. + oldIndent := box leftIndent. + box leftIndent:30. + + box addVerticalSpace:10. "/ component := box "/ addLabelledInputField:(resources string:'CVS repository:') "/ adjust:#right @@ -4492,45 +4492,45 @@ "/ component enableChannel:useManager. "/ component readOnly:true. "/ - cacheEntry := box - addLabelledInputField:(resources string:'Source Cache Dir:') - adjust:#right - on:sourceCacheDir - tabable:true - separateAtX:0.5. - cacheEntry immediateAccept:true; acceptOnLeave:false. - cacheEntry enableChannel:useManager. - - pos := box yPosition. - butt := Button label:(resources string:'Flush Cache now'). - butt action:[ box withWaitCursorDo:[ AbstractSourceCodeManager flushSourceCache ] ]. - box addComponent:butt tabable:true. - butt left:0.6; width:0.4; leftInset:0. - butt enableChannel:useManager. - - butt := Button label:(resources string:'Condense Cache now'). - butt action:[ box withWaitCursorDo:[ AbstractSourceCodeManager condenseSourceCache ] ]. - box addComponent:butt tabable:true. - butt left:0.6; width:0.4; leftInset:0. - butt enableChannel:useManager. - - localCheck := box addCheckBox:(resources string:'If Present, Use Local Source (Suppress Checkout)') on:localSourceFirst. - localCheck enableChannel:useManager. - - checkClassesBox := box addCheckBox:(resources string:'Check for halt/error-Sends when Checking in') on:checkClassesWhenCheckingIn. - checkClassesBox enableChannel:useManager. - - box leftIndent:oldIndent. - - (AbstractSourceCodeManager isNil - or:[AbstractSourceCodeManager defaultManager isNil]) ifTrue:[ - useManager value:false. - "/ cacheEntry disable. - "/ localCheck enable. - ] ifFalse:[ - sourceCacheDir value:(AbstractSourceCodeManager cacheDirectoryName). - ]. - box addHorizontalLine. + cacheEntry := box + addLabelledInputField:(resources string:'Source Cache Dir:') + adjust:#right + on:sourceCacheDir + tabable:true + separateAtX:0.5. + cacheEntry immediateAccept:true; acceptOnLeave:false. + cacheEntry enableChannel:useManager. + + pos := box yPosition. + butt := Button label:(resources string:'Flush Cache now'). + butt action:[ box withWaitCursorDo:[ AbstractSourceCodeManager flushSourceCache ] ]. + box addComponent:butt tabable:true. + butt left:0.6; width:0.4; leftInset:0. + butt enableChannel:useManager. + + butt := Button label:(resources string:'Condense Cache now'). + butt action:[ box withWaitCursorDo:[ AbstractSourceCodeManager condenseSourceCache ] ]. + box addComponent:butt tabable:true. + butt left:0.6; width:0.4; leftInset:0. + butt enableChannel:useManager. + + localCheck := box addCheckBox:(resources string:'If Present, Use Local Source (Suppress Checkout)') on:localSourceFirst. + localCheck enableChannel:useManager. + + checkClassesBox := box addCheckBox:(resources string:'Check for halt/error-Sends when Checking in') on:checkClassesWhenCheckingIn. + checkClassesBox enableChannel:useManager. + + box leftIndent:oldIndent. + + (AbstractSourceCodeManager isNil + or:[AbstractSourceCodeManager defaultManager isNil]) ifTrue:[ + useManager value:false. + "/ cacheEntry disable. + "/ localCheck enable. + ] ifFalse:[ + sourceCacheDir value:(AbstractSourceCodeManager cacheDirectoryName). + ]. + box addHorizontalLine. ]. pos := box yPosition. @@ -4561,8 +4561,8 @@ box addHorizontalLine. box - addHelpButtonFor:'Launcher/sourceSettings.html'; - addAbortAndOkButtons. + addHelpButtonFor:'Launcher/sourceSettings.html'; + addAbortAndOkButtons. box maxExtent:1000@600. @@ -4575,70 +4575,70 @@ "/ update system settings "/ box accepted ifTrue:[ - Smalltalk logDoits:logDoits value. - Class updateChanges:updChanges value. - ObjectMemory nameForChanges:changeFileName value. - - (hasManager and:[useManager value]) ifTrue:[ - manager isNil ifTrue:[ - Smalltalk at:#SourceCodeManager put:(AbstractSourceCodeManager defaultManager). - manager := Smalltalk at:#SourceCodeManager. - ]. - Class tryLocalSourceFirst:(localSourceFirst value). - - manager notNil ifTrue:[ + Smalltalk logDoits:logDoits value. + Class updateChanges:updChanges value. + ObjectMemory nameForChanges:(changeFileName value). + + (hasManager and:[useManager value]) ifTrue:[ + manager isNil ifTrue:[ + Smalltalk at:#SourceCodeManager put:(AbstractSourceCodeManager defaultManager). + manager := Smalltalk at:#SourceCodeManager. + ]. + Class tryLocalSourceFirst:(localSourceFirst value). + + manager notNil ifTrue:[ "/ localSourceFirst value ifFalse:[ - nm := sourceCacheDir value. - nm size > 0 ifTrue:[ - (fn := nm asFilename) exists ifFalse:[ - (self confirm:('CVS cache directory ''' , nm , ''' does not exist\create ?' withCRs)) ifTrue:[ - fn makeDirectory; - makeReadableForAll; - makeWritableForAll; - makeExecutableForAll. - ] - ]. - (fn isDirectory - and:[fn isReadable - and:[fn isWritable]]) ifTrue:[ - AbstractSourceCodeManager cacheDirectoryName:(sourceCacheDir value). - ] ifFalse:[ - self warn:'Invalid sourceCache directory.' - ] - ] + nm := sourceCacheDir value. + nm size > 0 ifTrue:[ + (fn := nm asFilename) exists ifFalse:[ + (self confirm:('CVS cache directory ''' , nm , ''' does not exist\create ?' withCRs)) ifTrue:[ + fn makeDirectory; + makeReadableForAll; + makeWritableForAll; + makeExecutableForAll. + ] + ]. + (fn isDirectory + and:[fn isReadable + and:[fn isWritable]]) ifTrue:[ + AbstractSourceCodeManager cacheDirectoryName:(sourceCacheDir value). + ] ifFalse:[ + self warn:'Invalid sourceCache directory.' + ] + ] "/ ] - ]. - - repositoryHolder notNil ifTrue:[ - repositoryHolder value size > 0 ifTrue:[ - manager notNil ifTrue:[ - manager initializeForRepository:repositoryHolder value. - ] - ]. - ]. - ] ifFalse:[ - Smalltalk at:#SourceCodeManager put:nil - ]. - - showErrorNotifier value ifFalse:[ - NoHandlerError emergencyHandler:nil - ] ifTrue:[ - NoHandlerError emergencyHandler:(AbstractLauncherApplication notifyingEmergencyHandler) - ]. - currentUserPrefs verboseBacktraceInDebugger:(showVerboseStack value). - currentUserPrefs syntaxColoring:syntaxColoring value. - currentUserPrefs at:#fullSelectorCheck put:fullSelectorCheck value. - currentUserPrefs autoFormatting:autoFormat value. - - UserPreferences current at:#checkClassesWhenCheckingIn put:checkClassesWhenCheckingIn value. + ]. + + repositoryHolder notNil ifTrue:[ + repositoryHolder value size > 0 ifTrue:[ + manager notNil ifTrue:[ + manager initializeForRepository:repositoryHolder value. + ] + ]. + ]. + ] ifFalse:[ + Smalltalk at:#SourceCodeManager put:nil + ]. + + showErrorNotifier value ifFalse:[ + NoHandlerError emergencyHandler:nil + ] ifTrue:[ + NoHandlerError emergencyHandler:(AbstractLauncherApplication notifyingEmergencyHandler) + ]. + currentUserPrefs verboseBacktraceInDebugger:(showVerboseStack value). + currentUserPrefs syntaxColoring:syntaxColoring value. + currentUserPrefs at:#fullSelectorCheck put:fullSelectorCheck value. + currentUserPrefs autoFormatting:autoFormat value. + + UserPreferences current at:#checkClassesWhenCheckingIn put:checkClassesWhenCheckingIn value. ]. box destroy - "Modified: / 9.9.1996 / 22:43:36 / stefan" - "Created: / 17.1.1997 / 17:39:33 / cg" - "Modified: / 16.4.1998 / 17:18:47 / ca" - "Modified: / 13.10.1998 / 15:47:31 / cg" + "Modified: / 09-09-1996 / 22:43:36 / stefan" + "Created: / 17-01-1997 / 17:39:33 / cg" + "Modified: / 16-04-1998 / 17:18:47 / ca" + "Modified: / 09-02-2011 / 20:32:56 / cg" ! stcCompilerSettings @@ -6750,9 +6750,9 @@ !AbstractLauncherApplication class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.398 2011-02-08 20:51:48 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.399 2011-02-09 19:40:39 cg Exp $' ! version_CVS - ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.398 2011-02-08 20:51:48 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.399 2011-02-09 19:40:39 cg Exp $' ! !