formatter settings now in userPrefs
(avoid autoloading RB-stuff when reading settings)
--- a/AbstractLauncherApplication.st Thu Feb 28 10:27:59 2002 +0100
+++ b/AbstractLauncherApplication.st Thu Feb 28 11:48:20 2002 +0100
@@ -3969,18 +3969,6 @@
s nextPutLine:'UserPreferences current at:' , k storeString , ' put:' , v storeString , '.'.
]
].
- (RBFormatter notNil and:[RBFormatter isLoaded]) ifTrue:[
- s nextPutLine:'RBFormatter notNil ifTrue:[ '.
- s nextPutLine:' RBFormatter tabIndent: ' , (RBFormatter tabIndent storeString) , '.'.
- s nextPutLine:' RBFormatter spaceAfterReturnToken: ' , (RBFormatter spaceAfterReturnToken storeString) , '.'.
- s nextPutLine:' RBFormatter spaceAfterKeywordSelector: ' , (RBFormatter spaceAfterKeywordSelector storeString) , '.'.
- s nextPutLine:' RBFormatter spaceAroundTemporaries: ' , (RBFormatter spaceAroundTemporaries storeString) , '.'.
- s nextPutLine:' RBFormatter emptyLineAfterTemporaries: ' , (RBFormatter emptyLineAfterTemporaries storeString) , '.'.
- s nextPutLine:' RBFormatter cStyleBlocks: ' , (RBFormatter cStyleBlocks storeString) , '.'.
- s nextPutLine:' RBFormatter blockArgumentsOnNewLine: ' , (RBFormatter blockArgumentsOnNewLine storeString) , '.'.
- s nextPutLine:' RBFormatter maxLengthForSingleLineBlocks: ' , (RBFormatter maxLengthForSingleLineBlocks storeString) , '.'.
- s nextPutLine:'].'.
- ].
s cr.
s nextPutLine:'"/'.
@@ -5732,6 +5720,14 @@
spec:(self formatterDialogSpec)
withBindings:bindings)
ifTrue:[
+ currentUserPrefs at:#'formatter.tabIndent' put:tabIndent value.
+ currentUserPrefs at:#'formatter.spaceAroundTemporaries' put:spaceAroundTemporaries value.
+ currentUserPrefs at:#'formatter.emptyLineAfterTemporaries' put:emptyLineAfterTemporaries value.
+ currentUserPrefs at:#'formatter.spaceAfterReturnToken' put:spaceAfterReturnToken value.
+ currentUserPrefs at:#'formatter.spaceAfterKeywordSelector' put:spaceAfterKeywordSelector value.
+ currentUserPrefs at:#'formatter.cStyleBlocks' put:cStyleBlocks value.
+ currentUserPrefs at:#'formatter.blockArgumentsOnNewLine' put:blockArgumentsOnNewLine value.
+ currentUserPrefs at:#'formatter.maxLengthForSingleLineBlocks' put:maxLengthForSingleLineBlocks value.
RBFormatter
tabIndent:tabIndent value;
spaceAroundTemporaries:spaceAroundTemporaries value;
@@ -6423,5 +6419,5 @@
!AbstractLauncherApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.191 2002-02-25 20:06:25 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.192 2002-02-28 10:48:20 cg Exp $'
! !