Browse Source

SmalltalkImage >> settings used

Herbert Vojčík 11 years ago
parent
commit
baed2f92c0
6 changed files with 35 additions and 33 deletions
  1. 18 16
      js/Helios-Workspace.js
  2. 2 2
      js/IDE.js
  3. 10 10
      js/Kernel-Infrastructure.js
  4. 2 2
      st/Helios-Workspace.st
  5. 1 1
      st/IDE.st
  6. 2 2
      st/Kernel-Infrastructure.st

+ 18 - 16
js/Helios-Workspace.js

@@ -390,45 +390,47 @@ selector: "editorOptions",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $SmalltalkSettings(){return globals.SmalltalkSettings||(typeof SmalltalkSettings=="undefined"?nil:SmalltalkSettings)}
+function $Smalltalk(){return globals.Smalltalk||(typeof Smalltalk=="undefined"?nil:Smalltalk)}
 function $HashedCollection(){return globals.HashedCollection||(typeof HashedCollection=="undefined"?nil:HashedCollection)}
 return smalltalk.withContext(function($ctx1) { 
-var $3,$2,$4,$5,$6,$7,$8,$9,$10,$11,$12,$1;
-$3=_st($SmalltalkSettings())._at_ifAbsent_("helios.codeMirrorTheme",(function(){
+var $4,$3,$2,$5,$6,$7,$8,$9,$10,$11,$12,$13,$1;
+$4=_st($Smalltalk())._settings();
+$ctx1.sendIdx["settings"]=1;
+$3=_st($4)._at_ifAbsent_("helios.codeMirrorTheme",(function(){
 return smalltalk.withContext(function($ctx2) {
 return "default helios";
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
 $ctx1.sendIdx["at:ifAbsent:"]=1;
 $2="theme".__minus_gt($3);
 $ctx1.sendIdx["->"]=1;
-$4="mode".__minus_gt("text/x-stsrc");
+$5="mode".__minus_gt("text/x-stsrc");
 $ctx1.sendIdx["->"]=2;
-$5="lineNumbers".__minus_gt(true);
+$6="lineNumbers".__minus_gt(true);
 $ctx1.sendIdx["->"]=3;
-$6="enterMode".__minus_gt("flat");
+$7="enterMode".__minus_gt("flat");
 $ctx1.sendIdx["->"]=4;
-$7="indentWithTabs".__minus_gt(true);
+$8="indentWithTabs".__minus_gt(true);
 $ctx1.sendIdx["->"]=5;
-$8="indentUnit".__minus_gt((4));
+$9="indentUnit".__minus_gt((4));
 $ctx1.sendIdx["->"]=6;
-$9="matchBrackets".__minus_gt(true);
+$10="matchBrackets".__minus_gt(true);
 $ctx1.sendIdx["->"]=7;
-$10="electricChars".__minus_gt(false);
+$11="electricChars".__minus_gt(false);
 $ctx1.sendIdx["->"]=8;
-$11="keyMap".__minus_gt("Amber");
+$12="keyMap".__minus_gt("Amber");
 $ctx1.sendIdx["->"]=9;
-$12="extraKeys".__minus_gt(_st($HashedCollection())._with_(_st(_st($SmalltalkSettings())._at_ifAbsent_("helios.completionKey",(function(){
+$13="extraKeys".__minus_gt(_st($HashedCollection())._with_(_st(_st(_st($Smalltalk())._settings())._at_ifAbsent_("helios.completionKey",(function(){
 return smalltalk.withContext(function($ctx2) {
 return "Shift-Space";
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)})}))).__minus_gt("autocomplete")));
 $ctx1.sendIdx["->"]=10;
-$1=globals.HashedCollection._from_([$2,$4,$5,$6,$7,$8,$9,$10,$11,$12]);
+$1=globals.HashedCollection._from_([$2,$5,$6,$7,$8,$9,$10,$11,$12,$13]);
 return $1;
 }, function($ctx1) {$ctx1.fill(self,"editorOptions",{},globals.HLCodeWidget)})},
 args: [],
-source: "editorOptions\x0a\x09^ #{\x0a\x09\x09'theme' -> (SmalltalkSettings at: 'helios.codeMirrorTheme' ifAbsent: [ 'default helios' ]).\x0a\x09\x09'mode' -> 'text/x-stsrc'.\x0a        'lineNumbers' -> true.\x0a        'enterMode' -> 'flat'.\x0a        'indentWithTabs' -> true.\x0a\x09\x09'indentUnit' -> 4.\x0a        'matchBrackets' -> true.\x0a        'electricChars' -> false.\x0a\x09\x09'keyMap' -> 'Amber'.\x0a\x09\x09'extraKeys' -> (HashedCollection with: (SmalltalkSettings at: 'helios.completionKey' ifAbsent: [ 'Shift-Space' ]) -> 'autocomplete')\x0a\x09}",
-messageSends: ["->", "at:ifAbsent:", "with:"],
-referencedClasses: ["SmalltalkSettings", "HashedCollection"]
+source: "editorOptions\x0a\x09^ #{\x0a\x09\x09'theme' -> (Smalltalk settings at: 'helios.codeMirrorTheme' ifAbsent: [ 'default helios' ]).\x0a\x09\x09'mode' -> 'text/x-stsrc'.\x0a        'lineNumbers' -> true.\x0a        'enterMode' -> 'flat'.\x0a        'indentWithTabs' -> true.\x0a\x09\x09'indentUnit' -> 4.\x0a        'matchBrackets' -> true.\x0a        'electricChars' -> false.\x0a\x09\x09'keyMap' -> 'Amber'.\x0a\x09\x09'extraKeys' -> (HashedCollection with: (Smalltalk settings at: 'helios.completionKey' ifAbsent: [ 'Shift-Space' ]) -> 'autocomplete')\x0a\x09}",
+messageSends: ["->", "at:ifAbsent:", "settings", "with:"],
+referencedClasses: ["Smalltalk", "HashedCollection"]
 }),
 globals.HLCodeWidget);
 

+ 2 - 2
js/IDE.js

@@ -946,7 +946,7 @@ fn: function (aTextarea){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
 self['@editor'] = CodeMirror.fromTextArea(aTextarea, {
-		theme: globals.SmalltalkSettings['ide.codeMirrorTheme'] || 'default',
+		theme: globals.Smalltalk._settings()['ide.codeMirrorTheme'] || 'default',
 		mode: 'text/x-stsrc',
 		lineNumbers: true,
 		enterMode: 'flat',
@@ -957,7 +957,7 @@ self['@editor'] = CodeMirror.fromTextArea(aTextarea, {
 	});
 return self}, function($ctx1) {$ctx1.fill(self,"setEditorOn:",{aTextarea:aTextarea},globals.SourceArea)})},
 args: ["aTextarea"],
-source: "setEditorOn: aTextarea\x0a\x09<self['@editor'] = CodeMirror.fromTextArea(aTextarea, {\x0a\x09\x09theme: globals.SmalltalkSettings['ide.codeMirrorTheme'] || 'default',\x0a\x09\x09mode: 'text/x-stsrc',\x0a\x09\x09lineNumbers: true,\x0a\x09\x09enterMode: 'flat',\x0a\x09\x09indentWithTabs: true,\x0a\x09\x09indentUnit: 4,\x0a\x09\x09matchBrackets: true,\x0a\x09\x09electricChars: false\x0a\x09})>",
+source: "setEditorOn: aTextarea\x0a\x09<self['@editor'] = CodeMirror.fromTextArea(aTextarea, {\x0a\x09\x09theme: globals.Smalltalk._settings()['ide.codeMirrorTheme'] || 'default',\x0a\x09\x09mode: 'text/x-stsrc',\x0a\x09\x09lineNumbers: true,\x0a\x09\x09enterMode: 'flat',\x0a\x09\x09indentWithTabs: true,\x0a\x09\x09indentUnit: 4,\x0a\x09\x09matchBrackets: true,\x0a\x09\x09electricChars: false\x0a\x09})>",
 messageSends: [],
 referencedClasses: []
 }),

+ 10 - 10
js/Kernel-Infrastructure.js

@@ -2589,16 +2589,16 @@ selector: "defaultAmdNamespace",
 protocol: 'accessing amd',
 fn: function (){
 var self=this;
-function $SmalltalkSettings(){return globals.SmalltalkSettings||(typeof SmalltalkSettings=="undefined"?nil:SmalltalkSettings)}
+function $Smalltalk(){return globals.Smalltalk||(typeof Smalltalk=="undefined"?nil:Smalltalk)}
 return smalltalk.withContext(function($ctx1) { 
 var $1;
-$1=_st($SmalltalkSettings())._at_("vm.defaultAmdNamespace");
+$1=_st(_st($Smalltalk())._settings())._at_("vm.defaultAmdNamespace");
 return $1;
 }, function($ctx1) {$ctx1.fill(self,"defaultAmdNamespace",{},globals.SmalltalkImage)})},
 args: [],
-source: "defaultAmdNamespace\x0a\x09^ SmalltalkSettings at: 'vm.defaultAmdNamespace'",
-messageSends: ["at:"],
-referencedClasses: ["SmalltalkSettings"]
+source: "defaultAmdNamespace\x0a\x09^ Smalltalk settings at: 'vm.defaultAmdNamespace'",
+messageSends: ["at:", "settings"],
+referencedClasses: ["Smalltalk"]
 }),
 globals.SmalltalkImage);
 
@@ -2608,14 +2608,14 @@ selector: "defaultAmdNamespace:",
 protocol: 'accessing amd',
 fn: function (aString){
 var self=this;
-function $SmalltalkSettings(){return globals.SmalltalkSettings||(typeof SmalltalkSettings=="undefined"?nil:SmalltalkSettings)}
+function $Smalltalk(){return globals.Smalltalk||(typeof Smalltalk=="undefined"?nil:Smalltalk)}
 return smalltalk.withContext(function($ctx1) { 
-_st($SmalltalkSettings())._at_put_("vm.defaultAmdNamespace",aString);
+_st(_st($Smalltalk())._settings())._at_put_("vm.defaultAmdNamespace",aString);
 return self}, function($ctx1) {$ctx1.fill(self,"defaultAmdNamespace:",{aString:aString},globals.SmalltalkImage)})},
 args: ["aString"],
-source: "defaultAmdNamespace: aString\x0a\x09SmalltalkSettings at: 'vm.defaultAmdNamespace' put: aString",
-messageSends: ["at:put:"],
-referencedClasses: ["SmalltalkSettings"]
+source: "defaultAmdNamespace: aString\x0a\x09Smalltalk settings at: 'vm.defaultAmdNamespace' put: aString",
+messageSends: ["at:put:", "settings"],
+referencedClasses: ["Smalltalk"]
 }),
 globals.SmalltalkImage);
 

+ 2 - 2
st/Helios-Workspace.st

@@ -82,7 +82,7 @@ currentLineOrSelection
 
 editorOptions
 	^ #{
-		'theme' -> (SmalltalkSettings at: 'helios.codeMirrorTheme' ifAbsent: [ 'default helios' ]).
+		'theme' -> (Smalltalk settings at: 'helios.codeMirrorTheme' ifAbsent: [ 'default helios' ]).
 		'mode' -> 'text/x-stsrc'.
         'lineNumbers' -> true.
         'enterMode' -> 'flat'.
@@ -91,7 +91,7 @@ editorOptions
         'matchBrackets' -> true.
         'electricChars' -> false.
 		'keyMap' -> 'Amber'.
-		'extraKeys' -> (HashedCollection with: (SmalltalkSettings at: 'helios.completionKey' ifAbsent: [ 'Shift-Space' ]) -> 'autocomplete')
+		'extraKeys' -> (HashedCollection with: (Smalltalk settings at: 'helios.completionKey' ifAbsent: [ 'Shift-Space' ]) -> 'autocomplete')
 	}
 !
 

+ 1 - 1
st/IDE.st

@@ -210,7 +210,7 @@ selection
 
 setEditorOn: aTextarea
 	<self['@editor'] = CodeMirror.fromTextArea(aTextarea, {
-		theme: globals.SmalltalkSettings['ide.codeMirrorTheme'] || 'default',
+		theme: globals.Smalltalk._settings()['ide.codeMirrorTheme'] || 'default',
 		mode: 'text/x-stsrc',
 		lineNumbers: true,
 		enterMode: 'flat',

+ 2 - 2
st/Kernel-Infrastructure.st

@@ -1021,11 +1021,11 @@ amdRequire
 !
 
 defaultAmdNamespace
-	^ SmalltalkSettings at: 'vm.defaultAmdNamespace'
+	^ Smalltalk settings at: 'vm.defaultAmdNamespace'
 !
 
 defaultAmdNamespace: aString
-	SmalltalkSettings at: 'vm.defaultAmdNamespace' put: aString
+	Smalltalk settings at: 'vm.defaultAmdNamespace' put: aString
 ! !
 
 !SmalltalkImage methodsFor: 'classes'!