--- a/AbstractSettingsApplication.st Mon Jul 01 12:31:33 2013 +0100
+++ b/AbstractSettingsApplication.st Mon Jul 01 22:15:23 2013 +0100
@@ -561,22 +561,24 @@
The object is typically the current userPreferences object, or a flag-holder, such
as ParserFlags.
Using this, and a list of aspect selectors replaces code like:
- someone aspect1 ~= (self aspect1 value) ifTrue:[^ true].
- someone aspect2 ~= (self aspect2 value) ifTrue:[^ true].
- ...
- someone aspectN ~= (self aspectN value) ifTrue:[^ true].
- ^ false
+ someone aspect1 ~= (self aspect1 value) ifTrue:[^ true].
+ someone aspect2 ~= (self aspect2 value) ifTrue:[^ true].
+ ...
+ someone aspectN ~= (self aspectN value) ifTrue:[^ true].
+ ^ false
Prerequisite:
- local aspects must be named like corresponding aspect methods in the flag-provider.
+ local aspects must be named like corresponding aspect methods in the flag-provider.
"
aListOfAspects do:[:eachAspectSymbol |
- (self perform:eachAspectSymbol) value ~= (anAspectProvider perform:eachAspectSymbol) ifTrue:[
-"/Transcript showCR:'different: ',eachAspectSymbol.
-"/Transcript showCR:'here: ',(self perform:eachAspectSymbol) value.
-"/Transcript showCR:'there: ',(anAspectProvider perform:eachAspectSymbol) value.
- ^ true
- ].
+ (self perform:eachAspectSymbol) value ~= (anAspectProvider perform:eachAspectSymbol) ifTrue:[
+ self debuggingCodeFor:#cg is:[
+ Transcript showCR:'different: ',eachAspectSymbol.
+ Transcript showCR:'here: ',((self perform:eachAspectSymbol) value) printString.
+ Transcript showCR:'there: ',((anAspectProvider perform:eachAspectSymbol) value) printString.
+ ].
+ ^ true
+ ].
].
^ false
@@ -3863,18 +3865,6 @@
extent: (Point 600 25)
)
(CheckBoxSpec
- label: 'Tab Stops in Multiples of 4'
- name: 'TabStopsMultiples4CheckBox'
- activeHelpKey: tabStops4
- model: tabsIs4
- translateLabel: true
- extent: (Point 600 25)
- )
- (DividerSpec
- name: 'Separator1'
- extent: (Point 600 4)
- )
- (CheckBoxSpec
label: 'Show Accept/Cancel Bar in Editor'
name: 'ShowAcceptCancelBarInBrowser'
activeHelpKey: showAcceptCancelBar
@@ -3890,6 +3880,18 @@
extent: (Point 600 25)
)
(DividerSpec
+ name: 'Separator5'
+ extent: (Point 600 4)
+ )
+ (CheckBoxSpec
+ label: 'Tab Stops in Multiples of 4'
+ name: 'TabStopsMultiples4CheckBox'
+ activeHelpKey: tabStops4
+ model: tabsIs4
+ translateLabel: true
+ extent: (Point 600 25)
+ )
+ (DividerSpec
name: 'Separator2'
extent: (Point 600 4)
)
@@ -7018,16 +7020,16 @@
'Start incremental background GC whenever freespace drops below this'
#igcLimit
-'Start incremental background GC whenever this amount has been allocated'
+'Start incremental background GC whenever this amount has been allocated in oldSpace since last GC'
#maxOldSpace
-'Never allocate more than this amount of memory (oldSpace limit).\Having a limit here prevents runaway programs from allocating virtually unlimited amounts of memory.\That could lead to thrashing the virtual memory system and make the while system useless.\Notice that on 32bit systmes, there is an implementation and OS dependent upper limit on this maximum'
+'Never allocate more than this amount of memory (oldSpace limit).\Having a limit here prevents runaway programs from allocating virtually unlimited amounts of memory.\That could lead to thrashing the virtual memory system and make the whole system useless.\Notice that on 32bit systmes, there is an implementation and OS dependent upper limit on this maximum'
#methodCodeSizeLimit
'Do not JIT, if an individual method''s code size exceeds this'
#newSpaceSize
-'Size of the space where new objects are created (newSpace).\The size determines the worst-case pause time of a scavenge operation.\For server and other request-processing applications, a bigger newSpace may substantally reduce the GC overhead (to almost 0%).\Useful values are between 400Kb to 16Mb'
+'Size of the space where new objects are created (newSpace).\The size determines the worst-case pause time of a scavenge operation.\For server, other request-processing applications and development, a bigger newSpace may substantally reduce the GC overhead (to almost 0%).\Useful values are between 400Kb to 16Mb'
#oldIncr
'Increase oldSpace in chunks of this size'
@@ -7095,16 +7097,58 @@
component:
(SpecCollection
collection: (
+ (LabelSpec
+ label: 'Limits:'
+ name: 'Label54'
+ translateLabel: true
+ adjust: left
+ extent: (Point 705 22)
+ )
+ (ViewSpec
+ name: 'StackLimitBox'
+ activeHelpKey: stackLimit
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'Stack Limit:'
+ name: 'Label38'
+ layout: (LayoutFrame 0 0 3 0 265 0 23 0)
+ activeHelpKey: stackLimit
+ translateLabel: true
+ adjust: right
+ )
+ (InputFieldSpec
+ name: 'EntryField20'
+ layout: (LayoutFrame 270 0 3 0 360 0 23 0)
+ activeHelpKey: stackLimit
+ enableChannel: supportsJustInTimeCompilation
+ model: stackLimit
+ type: fileSize
+ acceptOnReturn: true
+ acceptOnTab: true
+ acceptOnLostFocus: true
+ acceptOnPointerLeave: true
+ )
+ (LabelSpec
+ label: '(Trigger recursionInterrupt if more stack is used by a process)'
+ name: 'Label39'
+ layout: (LayoutFrame 364 0.0 3 0 0 1.0 23 0)
+ activeHelpKey: stackLimit
+ translateLabel: true
+ adjust: left
+ )
+ )
+
+ )
+ extent: (Point 705 30)
+ )
(ViewSpec
name: 'NewSpaceSizeBox'
activeHelpKey: newSpaceSize
component:
(SpecCollection
collection: (
- (DividerSpec
- name: 'Separator24'
- layout: (LayoutFrame 0 0.0 0 0 0 1.0 3 0)
- )
(LabelSpec
label: 'Size of NewSpace:'
name: 'Label44'
@@ -7143,10 +7187,6 @@
component:
(SpecCollection
collection: (
- (DividerSpec
- name: 'Separator25'
- layout: (LayoutFrame 0 0.0 0 0 0 1.0 3 0)
- )
(InputFieldSpec
name: 'EntryField24'
layout: (LayoutFrame 270 0 3 0 360 0 23 0)
@@ -7185,10 +7225,6 @@
component:
(SpecCollection
collection: (
- (DividerSpec
- name: 'Separator15'
- layout: (LayoutFrame 0 0.0 0 0 0 1.0 3 0)
- )
(LabelSpec
label: 'Quick Allocation Limit:'
name: 'Label26'
@@ -7222,141 +7258,11 @@
extent: (Point 705 30)
)
(ViewSpec
- name: 'IncrementalGCAllocationTriggerBox'
- activeHelpKey: igcLimit
- component:
- (SpecCollection
- collection: (
- (DividerSpec
- name: 'Separator26'
- layout: (LayoutFrame 0 0.0 0 0 0 1.0 3 0)
- )
- (LabelSpec
- label: 'Incremental GC Allocation Trigger:'
- name: 'Label48'
- layout: (LayoutFrame 0 0 3 0 265 0 23 0)
- activeHelpKey: igcLimit
- translateLabel: true
- adjust: right
- )
- (InputFieldSpec
- name: 'EntryField25'
- layout: (LayoutFrame 270 0 3 0 360 0 23 0)
- activeHelpKey: igcLimit
- model: igcLimit
- type: fileSize
- acceptOnReturn: true
- acceptOnTab: true
- acceptOnLostFocus: true
- acceptOnPointerLeave: true
- )
- (LabelSpec
- label: '(Start IGC whenever this amount has been allocated)'
- name: 'Label49'
- layout: (LayoutFrame 364 0.0 3 0 0 1.0 23 0)
- activeHelpKey: igcLimit
- translateLabel: true
- adjust: left
- )
- )
-
- )
- extent: (Point 705 30)
- )
- (ViewSpec
- name: 'IncrementalGCFreespaceTriggerBox'
- activeHelpKey: igcFreeLimit
- component:
- (SpecCollection
- collection: (
- (DividerSpec
- name: 'Separator27'
- layout: (LayoutFrame 0 0.0 0 0 0 1.0 3 0)
- )
- (LabelSpec
- label: 'Incremental GC Freespace Trigger:'
- name: 'Label50'
- layout: (LayoutFrame 0 0 3 0 265 0 23 0)
- activeHelpKey: igcFreeLimit
- translateLabel: true
- adjust: right
- )
- (InputFieldSpec
- name: 'EntryField26'
- layout: (LayoutFrame 270 0 3 0 360 0 23 0)
- activeHelpKey: igcFreeLimit
- model: igcFreeLimit
- type: fileSize
- acceptOnReturn: true
- acceptOnTab: true
- acceptOnLostFocus: true
- acceptOnPointerLeave: true
- )
- (LabelSpec
- label: '(Start IGC whenever freespace drops below this)'
- name: 'Label51'
- layout: (LayoutFrame 364 0.0 3 0 0 1.0 23 0)
- activeHelpKey: igcFreeLimit
- translateLabel: true
- adjust: left
- )
- )
-
- )
- extent: (Point 705 30)
- )
- (ViewSpec
- name: 'GCAmountBox'
- activeHelpKey: igcFreeAmount
- component:
- (SpecCollection
- collection: (
- (DividerSpec
- name: 'Separator18'
- layout: (LayoutFrame 0 0.0 0 0 0 1.0 3 0)
- )
- (LabelSpec
- label: 'Incremental GC Amount:'
- name: 'Label32'
- layout: (LayoutFrame 0 0 3 0 265 0 23 0)
- activeHelpKey: igcFreeAmount
- translateLabel: true
- adjust: right
- )
- (InputFieldSpec
- name: 'EntryField17'
- layout: (LayoutFrame 270 0 3 0 360 0 23 0)
- activeHelpKey: igcFreeAmount
- model: igcFreeAmount
- type: fileSize
- acceptOnReturn: true
- acceptOnTab: true
- acceptOnLostFocus: true
- acceptOnPointerLeave: true
- )
- (LabelSpec
- label: '(Try to keep this amount for peak requests)'
- name: 'Label33'
- layout: (LayoutFrame 364 0.0 3 0 0 1.0 23 0)
- activeHelpKey: igcFreeAmount
- translateLabel: true
- adjust: left
- )
- )
-
- )
- extent: (Point 705 30)
- )
- (ViewSpec
name: 'OldspaceIncrementBox'
activeHelpKey: oldIncr
component:
(SpecCollection
collection: (
- (DividerSpec
- name: 'Separator19'
- layout: (LayoutFrame 0 0.0 0 0 0 1.0 3 0)
- )
(LabelSpec
label: 'Oldspace Increment:'
name: 'Label34'
@@ -7394,10 +7300,6 @@
component:
(SpecCollection
collection: (
- (DividerSpec
- name: 'Separator20'
- layout: (LayoutFrame 0 0.0 0 0 0 1.0 3 0)
- )
(LabelSpec
label: 'Oldspace Compress Limit:'
name: 'Label36'
@@ -7431,58 +7333,11 @@
extent: (Point 705 30)
)
(ViewSpec
- name: 'StackLimitBox'
- activeHelpKey: stackLimit
- component:
- (SpecCollection
- collection: (
- (DividerSpec
- name: 'Separator21'
- layout: (LayoutFrame 0 0.0 0 0 0 1.0 3 0)
- )
- (LabelSpec
- label: 'Stack Limit:'
- name: 'Label38'
- layout: (LayoutFrame 0 0 3 0 265 0 23 0)
- activeHelpKey: stackLimit
- translateLabel: true
- adjust: right
- )
- (InputFieldSpec
- name: 'EntryField20'
- layout: (LayoutFrame 270 0 3 0 360 0 23 0)
- activeHelpKey: stackLimit
- enableChannel: supportsJustInTimeCompilation
- model: stackLimit
- type: fileSize
- acceptOnReturn: true
- acceptOnTab: true
- acceptOnLostFocus: true
- acceptOnPointerLeave: true
- )
- (LabelSpec
- label: '(Trigger recursionInterrupt if more stack is used by a process)'
- name: 'Label39'
- layout: (LayoutFrame 364 0.0 3 0 0 1.0 23 0)
- activeHelpKey: stackLimit
- translateLabel: true
- adjust: left
- )
- )
-
- )
- extent: (Point 705 30)
- )
- (ViewSpec
name: 'CodeLimitBox'
activeHelpKey: codeLimit
component:
(SpecCollection
collection: (
- (DividerSpec
- name: 'Separator22'
- layout: (LayoutFrame 0 0.0 0 0 0 1.0 3 0)
- )
(LabelSpec
label: 'Dynamic code Limit:'
name: 'Label40'
@@ -7522,10 +7377,6 @@
component:
(SpecCollection
collection: (
- (DividerSpec
- name: 'Separator28'
- layout: (LayoutFrame 0 0.0 0 0 0 1.0 3 0)
- )
(LabelSpec
label: 'Method Code Size Limit:'
name: 'Label52'
@@ -7559,16 +7410,95 @@
)
extent: (Point 705 30)
)
+ (LabelSpec
+ label: 'Triggers:'
+ name: 'Label55'
+ translateLabel: true
+ adjust: left
+ extent: (Point 705 22)
+ )
+ (ViewSpec
+ name: 'IncrementalGCAllocationTriggerBox'
+ activeHelpKey: igcLimit
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'Incremental GC Allocation Trigger:'
+ name: 'Label48'
+ layout: (LayoutFrame 0 0 3 0 265 0 23 0)
+ activeHelpKey: igcLimit
+ translateLabel: true
+ adjust: right
+ )
+ (InputFieldSpec
+ name: 'EntryField25'
+ layout: (LayoutFrame 270 0 3 0 360 0 23 0)
+ activeHelpKey: igcLimit
+ model: igcLimit
+ type: fileSize
+ acceptOnReturn: true
+ acceptOnTab: true
+ acceptOnLostFocus: true
+ acceptOnPointerLeave: true
+ )
+ (LabelSpec
+ label: '(Start IGC whenever this has been newly allocated)'
+ name: 'Label49'
+ layout: (LayoutFrame 364 0.0 3 0 0 1.0 23 0)
+ activeHelpKey: igcLimit
+ translateLabel: true
+ adjust: left
+ )
+ )
+
+ )
+ extent: (Point 705 30)
+ )
+ (ViewSpec
+ name: 'IncrementalGCFreespaceTriggerBox'
+ activeHelpKey: igcFreeLimit
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'Incremental GC Freespace Trigger:'
+ name: 'Label50'
+ layout: (LayoutFrame 0 0 3 0 265 0 23 0)
+ activeHelpKey: igcFreeLimit
+ translateLabel: true
+ adjust: right
+ )
+ (InputFieldSpec
+ name: 'EntryField26'
+ layout: (LayoutFrame 270 0 3 0 360 0 23 0)
+ activeHelpKey: igcFreeLimit
+ model: igcFreeLimit
+ type: fileSize
+ acceptOnReturn: true
+ acceptOnTab: true
+ acceptOnLostFocus: true
+ acceptOnPointerLeave: true
+ )
+ (LabelSpec
+ label: '(Start IGC whenever freespace drops below this)'
+ name: 'Label51'
+ layout: (LayoutFrame 364 0.0 3 0 0 1.0 23 0)
+ activeHelpKey: igcFreeLimit
+ translateLabel: true
+ adjust: left
+ )
+ )
+
+ )
+ extent: (Point 705 30)
+ )
(ViewSpec
name: 'CodeTriggerBox'
activeHelpKey: codeTrigger
component:
(SpecCollection
collection: (
- (DividerSpec
- name: 'Separator23'
- layout: (LayoutFrame 0 0.0 0 0 0 1.0 3 0)
- )
(LabelSpec
label: 'Incremental GC Dynamic Code Trigger:'
name: 'Label42'
@@ -7601,6 +7531,44 @@
)
extent: (Point 705 30)
)
+ (ViewSpec
+ name: 'GCAmountBox'
+ activeHelpKey: igcFreeAmount
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'Incremental GC Amount:'
+ name: 'Label32'
+ layout: (LayoutFrame 0 0 3 0 265 0 23 0)
+ activeHelpKey: igcFreeAmount
+ translateLabel: true
+ adjust: right
+ )
+ (InputFieldSpec
+ name: 'EntryField17'
+ layout: (LayoutFrame 270 0 3 0 360 0 23 0)
+ activeHelpKey: igcFreeAmount
+ model: igcFreeAmount
+ type: fileSize
+ acceptOnReturn: true
+ acceptOnTab: true
+ acceptOnLostFocus: true
+ acceptOnPointerLeave: true
+ )
+ (LabelSpec
+ label: '(Try to keep this amount for peak requests)'
+ name: 'Label33'
+ layout: (LayoutFrame 364 0.0 3 0 0 1.0 23 0)
+ activeHelpKey: igcFreeAmount
+ translateLabel: true
+ adjust: left
+ )
+ )
+
+ )
+ extent: (Point 705 30)
+ )
)
)
@@ -18551,13 +18519,14 @@
!
basicReadSettings
- self
- readAspects: (self aspects)
- from:currentUserPrefs.
+ self
+ readAspects: (self aspects)
+ from:currentUserPrefs.
Transcript current isExternalStream ifFalse:[
- self transcriptBufferSize value:Transcript current lineLimit.
- self autoRaiseTranscript value:Transcript current autoRaise.
+ self transcriptBufferSize value:Transcript current lineLimit.
+ "/ now already in userprefs
+ "/ self autoRaiseTranscript value:Transcript current autoRaise.
].
"Modified (format): / 27-07-2012 / 20:51:39 / cg"
@@ -18570,60 +18539,61 @@
newSystemBrowserClass := Tools::NewSystemBrowser ? NewSystemBrowser.
- self
- writeAspects:(self aspects)
- to:currentUserPrefs.
+ self
+ writeAspects:(self aspects)
+ to:currentUserPrefs.
currentUserPrefs useNewSettingsApplication ~= self useNewSettingsApplication value ifTrue:[
- currentUserPrefs useNewSettingsApplication:self useNewSettingsApplication value.
+ currentUserPrefs useNewSettingsApplication:self useNewSettingsApplication value.
].
currentUserPrefs useNewSystemBrowser ~= self useNewSystemBrowser value ifTrue:[
- currentUserPrefs useNewSystemBrowser:self useNewSystemBrowser value.
- (self useNewSystemBrowser value and:[newSystemBrowserClass isLoaded]) ifTrue:[
- newSystemBrowserClass installInLauncher.
- ] ifFalse:[
- newSystemBrowserClass removeFromLauncher.
- ].
- reopenLauncher := true.
+ currentUserPrefs useNewSystemBrowser:self useNewSystemBrowser value.
+ (self useNewSystemBrowser value and:[newSystemBrowserClass isLoaded]) ifTrue:[
+ newSystemBrowserClass installInLauncher.
+ ] ifFalse:[
+ newSystemBrowserClass removeFromLauncher.
+ ].
+ reopenLauncher := true.
].
(Smalltalk at:#FileBrowserV2) isBehavior ifTrue:[
- currentUserPrefs useNewFileBrowser ~= self useNewFileBrowser value ifTrue:[
- currentUserPrefs useNewFileBrowser:self useNewFileBrowser value.
- (self useNewFileBrowser value and:[FileBrowserV2 isLoaded]) ifTrue:[
- FileBrowserV2 installInLauncher.
- ] ifFalse:[
- FileBrowserV2 removeFromLauncher.
- ].
- reopenLauncher := true.
- ]
+ currentUserPrefs useNewFileBrowser ~= self useNewFileBrowser value ifTrue:[
+ currentUserPrefs useNewFileBrowser:self useNewFileBrowser value.
+ (self useNewFileBrowser value and:[FileBrowserV2 isLoaded]) ifTrue:[
+ FileBrowserV2 installInLauncher.
+ ] ifFalse:[
+ FileBrowserV2 removeFromLauncher.
+ ].
+ reopenLauncher := true.
+ ]
].
transcript := Transcript current.
(transcript notNil and:[transcript isExternalStream not]) ifTrue:[
- transcript lineLimit:self transcriptBufferSize value.
- transcript autoRaise:self autoRaiseTranscript value.
- launcher := transcript application.
+ transcript lineLimit:self transcriptBufferSize value.
+ "/ now already done by UserPreferences
+ "/ transcript autoRaise:self autoRaiseTranscript value.
+ launcher := transcript application.
].
showClock := self showClockInLauncher value.
currentUserPrefs showClockInLauncher ~= showClock ifTrue:[
- currentUserPrefs showClockInLauncher:showClock.
- launcher notNil ifTrue:[
- showClock ifTrue:[
- launcher startClock
- ] ifFalse:[
- launcher stopClock
- ]
- ]
+ currentUserPrefs showClockInLauncher:showClock.
+ launcher notNil ifTrue:[
+ showClock ifTrue:[
+ launcher startClock
+ ] ifFalse:[
+ launcher stopClock
+ ]
+ ]
].
Inspector := currentUserPrefs inspectorClassSetting.
reopenLauncher ifTrue:[
- launcher notNil ifTrue:[
- launcher reopenLauncher.
- ]
+ launcher notNil ifTrue:[
+ launcher reopenLauncher.
+ ]
].
"Modified: / 27-07-2012 / 20:51:46 / cg"
@@ -18817,12 +18787,13 @@
hasUnsavedChanges
(self
- hasChangedAspectIn:(self aspects)
- asComparedTo:currentUserPrefs) ifTrue:[^ true].
+ hasChangedAspectIn:(self aspects)
+ asComparedTo:currentUserPrefs) ifTrue:[^ true].
Transcript current isExternalStream ifFalse:[
- (self transcriptBufferSize value ~= Transcript current lineLimit) ifTrue:[^ true].
- (self autoRaiseTranscript value ~= Transcript current autoRaise) ifTrue:[^ true].
+ (self transcriptBufferSize value ~= Transcript current lineLimit) ifTrue:[^ true].
+ "/ now already in UserPreferences
+ "/ (self autoRaiseTranscript value ~= Transcript current autoRaise) ifTrue:[^ true].
].
^ false.
@@ -18832,11 +18803,11 @@
!AbstractSettingsApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.471 2013-06-23 22:25:06 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.478 2013-06-27 11:42:25 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.471 2013-06-23 22:25:06 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.478 2013-06-27 11:42:25 cg Exp $'
!
version_HG