1
0
Kaynağa Gözat

Recompile with new direct globals.

Herbert Vojčík 8 yıl önce
ebeveyn
işleme
53099226c6

+ 5 - 10
src/Helios-Browser-Tests.js

@@ -14,11 +14,10 @@ selector: "setUp",
 protocol: 'tests',
 fn: function (){
 var self=this;
-function $HLBrowserModel(){return $globals.HLBrowserModel||(typeof HLBrowserModel=="undefined"?nil:HLBrowserModel)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-self["@browser"]=$recv($HLBrowserModel())._new();
+self["@browser"]=$recv($globals.HLBrowserModel)._new();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"setUp",{},$globals.HLBrowserTest)});
@@ -39,7 +38,6 @@ selector: "testAllProtocolsSelectedWhenSelectingAClass",
 protocol: 'tests',
 fn: function (){
 var self=this;
-function $Object(){return $globals.Object||(typeof Object=="undefined"?nil:Object)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -50,7 +48,7 @@ $ctx1.sendIdx["selectedProtocol"]=1;
 //>>excludeEnd("ctx");
 $1=$recv($2)._isNil();
 self._assert_($1);
-$recv(self["@browser"])._selectedClass_($Object());
+$recv(self["@browser"])._selectedClass_($globals.Object);
 self._assert_equals_($recv(self["@browser"])._selectedProtocol(),$recv(self["@browser"])._allProtocol());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -73,14 +71,11 @@ protocol: 'tests',
 fn: function (){
 var self=this;
 var protocolSelectedCalled;
-function $HLProtocolSelected(){return $globals.HLProtocolSelected||(typeof HLProtocolSelected=="undefined"?nil:HLProtocolSelected)}
-function $Object(){return $globals.Object||(typeof Object=="undefined"?nil:Object)}
-function $ProtoObject(){return $globals.ProtoObject||(typeof ProtoObject=="undefined"?nil:ProtoObject)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 protocolSelectedCalled=(0);
-$recv($recv(self["@browser"])._announcer())._on_do_for_($HLProtocolSelected(),(function(){
+$recv($recv(self["@browser"])._announcer())._on_do_for_($globals.HLProtocolSelected,(function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -90,7 +85,7 @@ return protocolSelectedCalled;
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
 }),self);
-$recv(self["@browser"])._selectedClass_($Object());
+$recv(self["@browser"])._selectedClass_($globals.Object);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["selectedClass:"]=1;
 //>>excludeEnd("ctx");
@@ -98,7 +93,7 @@ self._assert_equals_(protocolSelectedCalled,(1));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["assert:equals:"]=1;
 //>>excludeEnd("ctx");
-$recv(self["@browser"])._selectedClass_($ProtoObject());
+$recv(self["@browser"])._selectedClass_($globals.ProtoObject);
 self._assert_equals_(protocolSelectedCalled,(2));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);

+ 85 - 166
src/Helios-Browser.js

@@ -32,14 +32,13 @@ selector: "classesListWidget",
 protocol: 'widgets',
 fn: function (){
 var self=this;
-function $HLClassesListWidget(){return $globals.HLClassesListWidget||(typeof HLClassesListWidget=="undefined"?nil:HLClassesListWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@classesListWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@classesListWidget"]=$recv($HLClassesListWidget())._on_(self._model());
+self["@classesListWidget"]=$recv($globals.HLClassesListWidget)._on_(self._model());
 self["@classesListWidget"];
 return $recv(self["@classesListWidget"])._next_(self._protocolsListWidget());
 } else {
@@ -110,14 +109,13 @@ selector: "methodsListWidget",
 protocol: 'widgets',
 fn: function (){
 var self=this;
-function $HLMethodsListWidget(){return $globals.HLMethodsListWidget||(typeof HLMethodsListWidget=="undefined"?nil:HLMethodsListWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@methodsListWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@methodsListWidget"]=$recv($HLMethodsListWidget())._on_(self._model());
+self["@methodsListWidget"]=$recv($globals.HLMethodsListWidget)._on_(self._model());
 self["@methodsListWidget"];
 return $recv(self["@methodsListWidget"])._next_(self._sourceWidget());
 } else {
@@ -142,14 +140,13 @@ selector: "model",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLBrowserModel(){return $globals.HLBrowserModel||(typeof HLBrowserModel=="undefined"?nil:HLBrowserModel)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@model"];
 if(($receiver = $1) == null || $receiver.isNil){
-self._model_($recv($HLBrowserModel())._new());
+self._model_($recv($globals.HLBrowserModel)._new());
 return self["@model"];
 } else {
 return $1;
@@ -198,8 +195,6 @@ selector: "observeModel",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLPackageSelected(){return $globals.HLPackageSelected||(typeof HLPackageSelected=="undefined"?nil:HLPackageSelected)}
-function $HLClassSelected(){return $globals.HLClassSelected||(typeof HLClassSelected=="undefined"?nil:HLClassSelected)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -212,11 +207,11 @@ $1=$recv($2)._announcer();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["announcer"]=1;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLPackageSelected(),"onPackageSelected:",self);
+$recv($1)._on_send_to_($globals.HLPackageSelected,"onPackageSelected:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=1;
 //>>excludeEnd("ctx");
-$recv($recv(self._model())._announcer())._on_send_to_($HLClassSelected(),"onClassSelected:",self);
+$recv($recv(self._model())._announcer())._on_send_to_($globals.HLClassSelected,"onClassSelected:",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeModel",{},$globals.HLBrowser)});
@@ -385,14 +380,13 @@ selector: "packagesListWidget",
 protocol: 'widgets',
 fn: function (){
 var self=this;
-function $HLPackagesListWidget(){return $globals.HLPackagesListWidget||(typeof HLPackagesListWidget=="undefined"?nil:HLPackagesListWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@packagesListWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@packagesListWidget"]=$recv($HLPackagesListWidget())._on_(self._model());
+self["@packagesListWidget"]=$recv($globals.HLPackagesListWidget)._on_(self._model());
 self["@packagesListWidget"];
 return $recv(self["@packagesListWidget"])._next_(self._classesListWidget());
 } else {
@@ -417,14 +411,13 @@ selector: "protocolsListWidget",
 protocol: 'widgets',
 fn: function (){
 var self=this;
-function $HLProtocolsListWidget(){return $globals.HLProtocolsListWidget||(typeof HLProtocolsListWidget=="undefined"?nil:HLProtocolsListWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@protocolsListWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@protocolsListWidget"]=$recv($HLProtocolsListWidget())._on_(self._model());
+self["@protocolsListWidget"]=$recv($globals.HLProtocolsListWidget)._on_(self._model());
 self["@protocolsListWidget"];
 return $recv(self["@protocolsListWidget"])._next_(self._methodsListWidget());
 } else {
@@ -449,11 +442,10 @@ selector: "registerBindingsOn:",
 protocol: 'keybindings',
 fn: function (aBindingGroup){
 var self=this;
-function $HLToolCommand(){return $globals.HLToolCommand||(typeof HLToolCommand=="undefined"?nil:HLToolCommand)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($HLToolCommand())._registerConcreteClassesOn_for_(aBindingGroup,self._model());
+$recv($globals.HLToolCommand)._registerConcreteClassesOn_for_(aBindingGroup,self._model());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"registerBindingsOn:",{aBindingGroup:aBindingGroup},$globals.HLBrowser)});
@@ -474,9 +466,6 @@ selector: "renderContentOn:",
 protocol: 'rendering',
 fn: function (html){
 var self=this;
-function $HLContainer(){return $globals.HLContainer||(typeof HLContainer=="undefined"?nil:HLContainer)}
-function $HLHorizontalSplitter(){return $globals.HLHorizontalSplitter||(typeof HLHorizontalSplitter=="undefined"?nil:HLHorizontalSplitter)}
-function $HLVerticalSplitter(){return $globals.HLVerticalSplitter||(typeof HLVerticalSplitter=="undefined"?nil:HLVerticalSplitter)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -485,19 +474,19 @@ $5=self._packagesListWidget();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["packagesListWidget"]=1;
 //>>excludeEnd("ctx");
-$4=$recv($HLVerticalSplitter())._with_with_($5,self._classesListWidget());
+$4=$recv($globals.HLVerticalSplitter)._with_with_($5,self._classesListWidget());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["with:with:"]=3;
 //>>excludeEnd("ctx");
-$3=$recv($HLVerticalSplitter())._with_with_($4,$recv($HLVerticalSplitter())._with_with_(self._protocolsListWidget(),self._methodsListWidget()));
+$3=$recv($globals.HLVerticalSplitter)._with_with_($4,$recv($globals.HLVerticalSplitter)._with_with_(self._protocolsListWidget(),self._methodsListWidget()));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["with:with:"]=2;
 //>>excludeEnd("ctx");
-$2=$recv($HLHorizontalSplitter())._with_with_($3,self._sourceWidget());
+$2=$recv($globals.HLHorizontalSplitter)._with_with_($3,self._sourceWidget());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["with:with:"]=1;
 //>>excludeEnd("ctx");
-$1=$recv($HLContainer())._with_($2);
+$1=$recv($globals.HLContainer)._with_($2);
 $recv(html)._with_($1);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["with:"]=1;
@@ -523,14 +512,13 @@ selector: "sourceWidget",
 protocol: 'widgets',
 fn: function (){
 var self=this;
-function $HLBrowserBottomWidget(){return $globals.HLBrowserBottomWidget||(typeof HLBrowserBottomWidget=="undefined"?nil:HLBrowserBottomWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$2,$receiver;
 $1=self["@sourceWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-$2=$recv($HLBrowserBottomWidget())._new();
+$2=$recv($globals.HLBrowserBottomWidget)._new();
 $recv($2)._model_(self._model());
 self["@sourceWidget"]=$recv($2)._yourself();
 return self["@sourceWidget"];
@@ -727,14 +715,13 @@ selector: "codeWidget",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLBrowserCodeWidget(){return $globals.HLBrowserCodeWidget||(typeof HLBrowserCodeWidget=="undefined"?nil:HLBrowserCodeWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$2,$receiver;
 $1=self["@codeWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-$2=$recv($HLBrowserCodeWidget())._new();
+$2=$recv($globals.HLBrowserCodeWidget)._new();
 $recv($2)._browserModel_(self._model());
 self["@codeWidget"]=$recv($2)._yourself();
 return self["@codeWidget"];
@@ -760,14 +747,13 @@ selector: "documentationWidget",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLDocumentationWidget(){return $globals.HLDocumentationWidget||(typeof HLDocumentationWidget=="undefined"?nil:HLDocumentationWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$2,$receiver;
 $1=self["@documentationWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-$2=$recv($HLDocumentationWidget())._new();
+$2=$recv($globals.HLDocumentationWidget)._new();
 $recv($2)._model_(self._model());
 self["@documentationWidget"]=$recv($2)._yourself();
 return self["@documentationWidget"];
@@ -860,18 +846,16 @@ selector: "observeModel",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLShowInstanceToggled(){return $globals.HLShowInstanceToggled||(typeof HLShowInstanceToggled=="undefined"?nil:HLShowInstanceToggled)}
-function $HLShowCommentToggled(){return $globals.HLShowCommentToggled||(typeof HLShowCommentToggled=="undefined"?nil:HLShowCommentToggled)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
 $1=$recv(self._model())._announcer();
-$recv($1)._on_send_to_($HLShowInstanceToggled(),"onShowInstanceToggled",self);
+$recv($1)._on_send_to_($globals.HLShowInstanceToggled,"onShowInstanceToggled",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=1;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLShowCommentToggled(),"onShowCommentToggled",self);
+$recv($1)._on_send_to_($globals.HLShowCommentToggled,"onShowCommentToggled",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeModel",{},$globals.HLBrowserBottomWidget)});
@@ -1006,11 +990,10 @@ selector: "renderPanesOn:",
 protocol: 'rendering',
 fn: function (html){
 var self=this;
-function $HLVerticalSplitter(){return $globals.HLVerticalSplitter||(typeof HLVerticalSplitter=="undefined"?nil:HLVerticalSplitter)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv(html)._with_($recv($HLVerticalSplitter())._with_with_(self._codeWidget(),self._documentationWidget()));
+$recv(html)._with_($recv($globals.HLVerticalSplitter)._with_with_(self._codeWidget(),self._documentationWidget()));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"renderPanesOn:",{html:html},$globals.HLBrowserBottomWidget)});
@@ -1034,11 +1017,10 @@ selector: "editComment",
 protocol: 'commands actions',
 fn: function (){
 var self=this;
-function $HLEditComment(){return $globals.HLEditComment||(typeof HLEditComment=="undefined"?nil:HLEditComment)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv(self._announcer())._announce_($recv($HLEditComment())._new());
+$recv(self._announcer())._announce_($recv($globals.HLEditComment)._new());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"editComment",{},$globals.HLBrowserModel)});
@@ -1059,11 +1041,10 @@ selector: "focusOnClasses",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLClassesFocusRequested(){return $globals.HLClassesFocusRequested||(typeof HLClassesFocusRequested=="undefined"?nil:HLClassesFocusRequested)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv(self._announcer())._announce_($recv($HLClassesFocusRequested())._new());
+$recv(self._announcer())._announce_($recv($globals.HLClassesFocusRequested)._new());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"focusOnClasses",{},$globals.HLBrowserModel)});
@@ -1084,11 +1065,10 @@ selector: "focusOnDocumentation",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLDocumentationFocusRequested(){return $globals.HLDocumentationFocusRequested||(typeof HLDocumentationFocusRequested=="undefined"?nil:HLDocumentationFocusRequested)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv(self._announcer())._announce_($recv($HLDocumentationFocusRequested())._new());
+$recv(self._announcer())._announce_($recv($globals.HLDocumentationFocusRequested)._new());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"focusOnDocumentation",{},$globals.HLBrowserModel)});
@@ -1109,11 +1089,10 @@ selector: "focusOnMethods",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLMethodsFocusRequested(){return $globals.HLMethodsFocusRequested||(typeof HLMethodsFocusRequested=="undefined"?nil:HLMethodsFocusRequested)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv(self._announcer())._announce_($recv($HLMethodsFocusRequested())._new());
+$recv(self._announcer())._announce_($recv($globals.HLMethodsFocusRequested)._new());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"focusOnMethods",{},$globals.HLBrowserModel)});
@@ -1134,11 +1113,10 @@ selector: "focusOnPackages",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLPackagesFocusRequested(){return $globals.HLPackagesFocusRequested||(typeof HLPackagesFocusRequested=="undefined"?nil:HLPackagesFocusRequested)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv(self._announcer())._announce_($recv($HLPackagesFocusRequested())._new());
+$recv(self._announcer())._announce_($recv($globals.HLPackagesFocusRequested)._new());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"focusOnPackages",{},$globals.HLBrowserModel)});
@@ -1159,11 +1137,10 @@ selector: "focusOnProtocols",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLProtocolsFocusRequested(){return $globals.HLProtocolsFocusRequested||(typeof HLProtocolsFocusRequested=="undefined"?nil:HLProtocolsFocusRequested)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv(self._announcer())._announce_($recv($HLProtocolsFocusRequested())._new());
+$recv(self._announcer())._announce_($recv($globals.HLProtocolsFocusRequested)._new());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"focusOnProtocols",{},$globals.HLBrowserModel)});
@@ -1184,11 +1161,10 @@ selector: "focusOnSourceCode",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLSourceCodeFocusRequested(){return $globals.HLSourceCodeFocusRequested||(typeof HLSourceCodeFocusRequested=="undefined"?nil:HLSourceCodeFocusRequested)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv(self._announcer())._announce_($recv($HLSourceCodeFocusRequested())._new());
+$recv(self._announcer())._announce_($recv($globals.HLSourceCodeFocusRequested)._new());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"focusOnSourceCode",{},$globals.HLBrowserModel)});
@@ -1251,7 +1227,6 @@ selector: "showClassTemplate",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLShowTemplate(){return $globals.HLShowTemplate||(typeof HLShowTemplate=="undefined"?nil:HLShowTemplate)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1263,7 +1238,7 @@ $1;
 var package_;
 package_=$receiver;
 $2=self._announcer();
-$4=$recv($HLShowTemplate())._new();
+$4=$recv($globals.HLShowTemplate)._new();
 $recv($4)._template_($recv(package_)._classTemplate());
 $3=$recv($4)._yourself();
 $recv($2)._announce_($3);
@@ -1318,7 +1293,6 @@ selector: "showComment:",
 protocol: 'accessing',
 fn: function (aBoolean){
 var self=this;
-function $HLShowCommentToggled(){return $globals.HLShowCommentToggled||(typeof HLShowCommentToggled=="undefined"?nil:HLShowCommentToggled)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1329,7 +1303,7 @@ return $core.withContext(function($ctx2) {
 self["@showComment"]=aBoolean;
 self["@showComment"];
 "helios.browser.showComment"._settingValue_(aBoolean);
-return $recv(self._announcer())._announce_($recv($HLShowCommentToggled())._new());
+return $recv(self._announcer())._announce_($recv($globals.HLShowCommentToggled)._new());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
@@ -1383,7 +1357,6 @@ selector: "showInstance:",
 protocol: 'accessing',
 fn: function (aBoolean){
 var self=this;
-function $HLShowInstanceToggled(){return $globals.HLShowInstanceToggled||(typeof HLShowInstanceToggled=="undefined"?nil:HLShowInstanceToggled)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1412,7 +1385,7 @@ $2=$recv(self._selectedClass())._theMetaClass();
 };
 self._selectedClass_($2);
 };
-return $recv(self._announcer())._announce_($recv($HLShowInstanceToggled())._new());
+return $recv(self._announcer())._announce_($recv($globals.HLShowInstanceToggled)._new());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
@@ -1437,7 +1410,6 @@ selector: "showMethodTemplate",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLShowTemplate(){return $globals.HLShowTemplate||(typeof HLShowTemplate=="undefined"?nil:HLShowTemplate)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1449,7 +1421,7 @@ $1;
 var theClass;
 theClass=$receiver;
 $2=self._announcer();
-$4=$recv($HLShowTemplate())._new();
+$4=$recv($globals.HLShowTemplate)._new();
 $recv($4)._template_($recv(theClass)._methodTemplate());
 $3=$recv($4)._yourself();
 $recv($2)._announce_($3);
@@ -1665,14 +1637,13 @@ selector: "overriddenCache",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HashedCollection(){return $globals.HashedCollection||(typeof HashedCollection=="undefined"?nil:HashedCollection)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@overriddenCache"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@overriddenCache"]=$recv($HashedCollection())._new();
+self["@overriddenCache"]=$recv($globals.HashedCollection)._new();
 return self["@overriddenCache"];
 } else {
 return $1;
@@ -1696,14 +1667,13 @@ selector: "overrideCache",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HashedCollection(){return $globals.HashedCollection||(typeof HashedCollection=="undefined"?nil:HashedCollection)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@overrideCache"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@overrideCache"]=$recv($HashedCollection())._new();
+self["@overrideCache"]=$recv($globals.HashedCollection)._new();
 return self["@overrideCache"];
 } else {
 return $1;
@@ -1936,11 +1906,10 @@ selector: "focusMethodsListWidget",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLMethodsListFocus(){return $globals.HLMethodsListFocus||(typeof HLMethodsListFocus=="undefined"?nil:HLMethodsListFocus)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($recv(self._model())._announcer())._announce_($recv($HLMethodsListFocus())._new());
+$recv($recv(self._model())._announcer())._announce_($recv($globals.HLMethodsListFocus)._new());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"focusMethodsListWidget",{},$globals.HLClassesListWidget)});
@@ -1961,11 +1930,10 @@ selector: "focusProtocolsListWidget",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLProtocolsListFocus(){return $globals.HLProtocolsListFocus||(typeof HLProtocolsListFocus=="undefined"?nil:HLProtocolsListFocus)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($recv(self._model())._announcer())._announce_($recv($HLProtocolsListFocus())._new());
+$recv($recv(self._model())._announcer())._announce_($recv($globals.HLProtocolsListFocus)._new());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"focusProtocolsListWidget",{},$globals.HLClassesListWidget)});
@@ -2066,33 +2034,28 @@ selector: "observeModel",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLPackageSelected(){return $globals.HLPackageSelected||(typeof HLPackageSelected=="undefined"?nil:HLPackageSelected)}
-function $HLShowInstanceToggled(){return $globals.HLShowInstanceToggled||(typeof HLShowInstanceToggled=="undefined"?nil:HLShowInstanceToggled)}
-function $HLShowCommentToggled(){return $globals.HLShowCommentToggled||(typeof HLShowCommentToggled=="undefined"?nil:HLShowCommentToggled)}
-function $HLClassSelected(){return $globals.HLClassSelected||(typeof HLClassSelected=="undefined"?nil:HLClassSelected)}
-function $HLClassesFocusRequested(){return $globals.HLClassesFocusRequested||(typeof HLClassesFocusRequested=="undefined"?nil:HLClassesFocusRequested)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
 $1=$recv(self._model())._announcer();
-$recv($1)._on_send_to_($HLPackageSelected(),"onPackageSelected:",self);
+$recv($1)._on_send_to_($globals.HLPackageSelected,"onPackageSelected:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=1;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLShowInstanceToggled(),"onShowInstanceToggled",self);
+$recv($1)._on_send_to_($globals.HLShowInstanceToggled,"onShowInstanceToggled",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=2;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLShowCommentToggled(),"onShowCommentToggled",self);
+$recv($1)._on_send_to_($globals.HLShowCommentToggled,"onShowCommentToggled",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=3;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLClassSelected(),"onClassSelected:",self);
+$recv($1)._on_send_to_($globals.HLClassSelected,"onClassSelected:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=4;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLClassesFocusRequested(),"onClassesFocusRequested",self);
+$recv($1)._on_send_to_($globals.HLClassesFocusRequested,"onClassesFocusRequested",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeModel",{},$globals.HLClassesListWidget)});
@@ -2113,38 +2076,32 @@ selector: "observeSystem",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $ClassAdded(){return $globals.ClassAdded||(typeof ClassAdded=="undefined"?nil:ClassAdded)}
-function $ClassRemoved(){return $globals.ClassRemoved||(typeof ClassRemoved=="undefined"?nil:ClassRemoved)}
-function $ClassMoved(){return $globals.ClassMoved||(typeof ClassMoved=="undefined"?nil:ClassMoved)}
-function $ClassRenamed(){return $globals.ClassRenamed||(typeof ClassRenamed=="undefined"?nil:ClassRenamed)}
-function $ClassMigrated(){return $globals.ClassMigrated||(typeof ClassMigrated=="undefined"?nil:ClassMigrated)}
-function $ClassCommentChanged(){return $globals.ClassCommentChanged||(typeof ClassCommentChanged=="undefined"?nil:ClassCommentChanged)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
 $1=$recv(self._model())._systemAnnouncer();
-$recv($1)._on_send_to_($ClassAdded(),"onClassAdded:",self);
+$recv($1)._on_send_to_($globals.ClassAdded,"onClassAdded:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=1;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($ClassRemoved(),"onClassRemoved:",self);
+$recv($1)._on_send_to_($globals.ClassRemoved,"onClassRemoved:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=2;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($ClassMoved(),"onClassMoved:",self);
+$recv($1)._on_send_to_($globals.ClassMoved,"onClassMoved:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=3;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($ClassRenamed(),"onClassRenamed:",self);
+$recv($1)._on_send_to_($globals.ClassRenamed,"onClassRenamed:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=4;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($ClassMigrated(),"onClassMigrated:",self);
+$recv($1)._on_send_to_($globals.ClassMigrated,"onClassMigrated:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=5;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($ClassCommentChanged(),"onClassCommentChanged:",self);
+$recv($1)._on_send_to_($globals.ClassCommentChanged,"onClassCommentChanged:",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeSystem",{},$globals.HLClassesListWidget)});
@@ -2559,7 +2516,6 @@ protocol: 'rendering',
 fn: function (html){
 var self=this;
 var checkbox;
-function $String(){return $globals.String||(typeof String=="undefined"?nil:String)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -2581,7 +2537,7 @@ $3=$recv(html)._button();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["button"]=1;
 //>>excludeEnd("ctx");
-$4=$recv($String())._streamContents_((function(str){
+$4=$recv($globals.String)._streamContents_((function(str){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx3) {
 //>>excludeEnd("ctx");
@@ -2628,7 +2584,7 @@ $ctx2.sendIdx["onClick:"]=1;
 //>>excludeEnd("ctx");
 $6;
 $7=$recv(html)._button();
-$recv($7)._class_($recv($String())._streamContents_((function(str){
+$recv($7)._class_($recv($globals.String)._streamContents_((function(str){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx3) {
 //>>excludeEnd("ctx");
@@ -2838,12 +2794,11 @@ protocol: 'rendering',
 fn: function (aClass,anInteger,html){
 var self=this;
 var indent;
-function $String(){return $globals.String||(typeof String=="undefined"?nil:String)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-indent=$recv($String())._fromCharCode_((160));
+indent=$recv($globals.String)._fromCharCode_((160));
 $1=$recv($recv(indent).__comma(indent)).__comma(indent);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx[","]=2;
@@ -2852,7 +2807,7 @@ indent=$recv($1).__comma(indent);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx[","]=1;
 //>>excludeEnd("ctx");
-$recv($recv(html)._span())._with_($recv($String())._streamContents_((function(str){
+$recv($recv(html)._span())._with_($recv($globals.String)._streamContents_((function(str){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -3392,23 +3347,20 @@ selector: "observeModel",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLClassSelected(){return $globals.HLClassSelected||(typeof HLClassSelected=="undefined"?nil:HLClassSelected)}
-function $HLEditComment(){return $globals.HLEditComment||(typeof HLEditComment=="undefined"?nil:HLEditComment)}
-function $HLDocumentationFocusRequested(){return $globals.HLDocumentationFocusRequested||(typeof HLDocumentationFocusRequested=="undefined"?nil:HLDocumentationFocusRequested)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
 $1=$recv(self._model())._announcer();
-$recv($1)._on_send_to_($HLClassSelected(),"onClassSelected:",self);
+$recv($1)._on_send_to_($globals.HLClassSelected,"onClassSelected:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=1;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLEditComment(),"onEditDocumentation",self);
+$recv($1)._on_send_to_($globals.HLEditComment,"onEditDocumentation",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=2;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLDocumentationFocusRequested(),"onDocumentationFocusRequested",self);
+$recv($1)._on_send_to_($globals.HLDocumentationFocusRequested,"onDocumentationFocusRequested",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeModel",{},$globals.HLDocumentationWidget)});
@@ -3429,11 +3381,10 @@ selector: "observeSystem",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $ClassCommentChanged(){return $globals.ClassCommentChanged||(typeof ClassCommentChanged=="undefined"?nil:ClassCommentChanged)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($recv(self._model())._systemAnnouncer())._on_send_to_($ClassCommentChanged(),"onClassCommentChanged:",self);
+$recv($recv(self._model())._systemAnnouncer())._on_send_to_($globals.ClassCommentChanged,"onClassCommentChanged:",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeSystem",{},$globals.HLDocumentationWidget)});
@@ -3626,7 +3577,6 @@ selector: "renderDocOn:",
 protocol: 'rendering',
 fn: function (html){
 var self=this;
-function $Showdown(){return $globals.Showdown||(typeof Showdown=="undefined"?nil:Showdown)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -3671,7 +3621,7 @@ $3;
 $6=$recv(html)._div();
 $recv($6)._class_("markdown");
 $5=$recv($6)._asJQuery();
-$recv($5)._html_($recv($recv($recv($Showdown())._at_("converter"))._new())._makeHtml_(self._documentation()));
+$recv($5)._html_($recv($recv($recv($globals.Showdown)._at_("converter"))._new())._makeHtml_(self._documentation()));
 };
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -4155,28 +4105,24 @@ selector: "observeModel",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLProtocolSelected(){return $globals.HLProtocolSelected||(typeof HLProtocolSelected=="undefined"?nil:HLProtocolSelected)}
-function $HLShowInstanceToggled(){return $globals.HLShowInstanceToggled||(typeof HLShowInstanceToggled=="undefined"?nil:HLShowInstanceToggled)}
-function $HLMethodSelected(){return $globals.HLMethodSelected||(typeof HLMethodSelected=="undefined"?nil:HLMethodSelected)}
-function $HLMethodsFocusRequested(){return $globals.HLMethodsFocusRequested||(typeof HLMethodsFocusRequested=="undefined"?nil:HLMethodsFocusRequested)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
 $1=$recv(self._model())._announcer();
-$recv($1)._on_send_to_($HLProtocolSelected(),"onProtocolSelected:",self);
+$recv($1)._on_send_to_($globals.HLProtocolSelected,"onProtocolSelected:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=1;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLShowInstanceToggled(),"onShowInstanceToggled",self);
+$recv($1)._on_send_to_($globals.HLShowInstanceToggled,"onShowInstanceToggled",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=2;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLMethodSelected(),"onMethodSelected:",self);
+$recv($1)._on_send_to_($globals.HLMethodSelected,"onMethodSelected:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=3;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLMethodsFocusRequested(),"onMethodsFocusRequested",self);
+$recv($1)._on_send_to_($globals.HLMethodsFocusRequested,"onMethodsFocusRequested",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeModel",{},$globals.HLMethodsListWidget)});
@@ -4197,33 +4143,28 @@ selector: "observeSystem",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $ProtocolAdded(){return $globals.ProtocolAdded||(typeof ProtocolAdded=="undefined"?nil:ProtocolAdded)}
-function $ProtocolRemoved(){return $globals.ProtocolRemoved||(typeof ProtocolRemoved=="undefined"?nil:ProtocolRemoved)}
-function $MethodAdded(){return $globals.MethodAdded||(typeof MethodAdded=="undefined"?nil:MethodAdded)}
-function $MethodRemoved(){return $globals.MethodRemoved||(typeof MethodRemoved=="undefined"?nil:MethodRemoved)}
-function $MethodMoved(){return $globals.MethodMoved||(typeof MethodMoved=="undefined"?nil:MethodMoved)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
 $1=$recv(self._model())._systemAnnouncer();
-$recv($1)._on_send_to_($ProtocolAdded(),"onProtocolAdded:",self);
+$recv($1)._on_send_to_($globals.ProtocolAdded,"onProtocolAdded:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=1;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($ProtocolRemoved(),"onProtocolRemoved:",self);
+$recv($1)._on_send_to_($globals.ProtocolRemoved,"onProtocolRemoved:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=2;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($MethodAdded(),"onMethodAdded:",self);
+$recv($1)._on_send_to_($globals.MethodAdded,"onMethodAdded:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=3;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($MethodRemoved(),"onMethodRemoved:",self);
+$recv($1)._on_send_to_($globals.MethodRemoved,"onMethodRemoved:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=4;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($MethodMoved(),"onMethodMoved:",self);
+$recv($1)._on_send_to_($globals.MethodMoved,"onMethodMoved:",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeSystem",{},$globals.HLMethodsListWidget)});
@@ -4569,7 +4510,6 @@ selector: "overrideSelectors",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $Set(){return $globals.Set||(typeof Set=="undefined"?nil:Set)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -4577,7 +4517,7 @@ return $recv(self._selectorsCache())._at_ifAbsentPut_("override",(function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-return $recv($recv($recv(self._model())._selectedClass())._allSuperclasses())._inject_into_($recv($Set())._new(),(function(acc,each){
+return $recv($recv($recv(self._model())._selectedClass())._allSuperclasses())._inject_into_($recv($globals.Set)._new(),(function(acc,each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx3) {
 //>>excludeEnd("ctx");
@@ -4610,7 +4550,6 @@ selector: "overridenSelectors",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $Set(){return $globals.Set||(typeof Set=="undefined"?nil:Set)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -4618,7 +4557,7 @@ return $recv(self._selectorsCache())._at_ifAbsentPut_("overriden",(function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-return $recv($recv($recv(self._model())._selectedClass())._allSubclasses())._inject_into_($recv($Set())._new(),(function(acc,each){
+return $recv($recv($recv(self._model())._selectedClass())._allSubclasses())._inject_into_($recv($globals.Set)._new(),(function(acc,each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx3) {
 //>>excludeEnd("ctx");
@@ -4903,11 +4842,10 @@ selector: "selectorsCache",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLSelectorsCache(){return $globals.HLSelectorsCache||(typeof HLSelectorsCache=="undefined"?nil:HLSelectorsCache)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($HLSelectorsCache())._current();
+return $recv($globals.HLSelectorsCache)._current();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selectorsCache",{},$globals.HLMethodsListWidget.klass)});
 //>>excludeEnd("ctx");
@@ -4961,11 +4899,10 @@ selector: "focusClassesListWidget",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLClassesListFocus(){return $globals.HLClassesListFocus||(typeof HLClassesListFocus=="undefined"?nil:HLClassesListFocus)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($recv(self._model())._announcer())._announce_($recv($HLClassesListFocus())._new());
+$recv($recv(self._model())._announcer())._announce_($recv($globals.HLClassesListFocus)._new());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"focusClassesListWidget",{},$globals.HLPackagesListWidget)});
@@ -5071,18 +5008,16 @@ selector: "observeModel",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLPackageSelected(){return $globals.HLPackageSelected||(typeof HLPackageSelected=="undefined"?nil:HLPackageSelected)}
-function $HLPackagesFocusRequested(){return $globals.HLPackagesFocusRequested||(typeof HLPackagesFocusRequested=="undefined"?nil:HLPackagesFocusRequested)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
 $1=$recv(self._model())._announcer();
-$recv($1)._on_send_to_($HLPackageSelected(),"onPackageSelected:",self);
+$recv($1)._on_send_to_($globals.HLPackageSelected,"onPackageSelected:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=1;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLPackagesFocusRequested(),"onPackagesFocusRequested",self);
+$recv($1)._on_send_to_($globals.HLPackagesFocusRequested,"onPackagesFocusRequested",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeModel",{},$globals.HLPackagesListWidget)});
@@ -5103,10 +5038,6 @@ selector: "observeSystem",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $ClassAdded(){return $globals.ClassAdded||(typeof ClassAdded=="undefined"?nil:ClassAdded)}
-function $PackageAdded(){return $globals.PackageAdded||(typeof PackageAdded=="undefined"?nil:PackageAdded)}
-function $PackageClean(){return $globals.PackageClean||(typeof PackageClean=="undefined"?nil:PackageClean)}
-function $PackageDirty(){return $globals.PackageDirty||(typeof PackageDirty=="undefined"?nil:PackageDirty)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -5119,7 +5050,7 @@ $1=$recv($2)._systemAnnouncer();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["systemAnnouncer"]=1;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($ClassAdded(),"onClassAdded:",self);
+$recv($1)._on_send_to_($globals.ClassAdded,"onClassAdded:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=1;
 //>>excludeEnd("ctx");
@@ -5131,7 +5062,7 @@ $3=$recv($4)._systemAnnouncer();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["systemAnnouncer"]=2;
 //>>excludeEnd("ctx");
-$recv($3)._on_send_to_($PackageAdded(),"onPackageAdded:",self);
+$recv($3)._on_send_to_($globals.PackageAdded,"onPackageAdded:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=2;
 //>>excludeEnd("ctx");
@@ -5143,11 +5074,11 @@ $5=$recv($6)._systemAnnouncer();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["systemAnnouncer"]=3;
 //>>excludeEnd("ctx");
-$recv($5)._on_send_to_($PackageClean(),"onPackageStateChanged",self);
+$recv($5)._on_send_to_($globals.PackageClean,"onPackageStateChanged",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=3;
 //>>excludeEnd("ctx");
-$recv($recv(self._model())._systemAnnouncer())._on_send_to_($PackageDirty(),"onPackageStateChanged",self);
+$recv($recv(self._model())._systemAnnouncer())._on_send_to_($globals.PackageDirty,"onPackageStateChanged",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeSystem",{},$globals.HLPackagesListWidget)});
@@ -5475,28 +5406,24 @@ selector: "observeModel",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLClassSelected(){return $globals.HLClassSelected||(typeof HLClassSelected=="undefined"?nil:HLClassSelected)}
-function $HLShowInstanceToggled(){return $globals.HLShowInstanceToggled||(typeof HLShowInstanceToggled=="undefined"?nil:HLShowInstanceToggled)}
-function $HLProtocolSelected(){return $globals.HLProtocolSelected||(typeof HLProtocolSelected=="undefined"?nil:HLProtocolSelected)}
-function $HLProtocolsFocusRequested(){return $globals.HLProtocolsFocusRequested||(typeof HLProtocolsFocusRequested=="undefined"?nil:HLProtocolsFocusRequested)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
 $1=$recv(self._model())._announcer();
-$recv($1)._on_send_to_($HLClassSelected(),"onClassSelected:",self);
+$recv($1)._on_send_to_($globals.HLClassSelected,"onClassSelected:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=1;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLShowInstanceToggled(),"onClassSelected:",self);
+$recv($1)._on_send_to_($globals.HLShowInstanceToggled,"onClassSelected:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=2;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLProtocolSelected(),"onProtocolSelected:",self);
+$recv($1)._on_send_to_($globals.HLProtocolSelected,"onProtocolSelected:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=3;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLProtocolsFocusRequested(),"onProtocolsFocusRequested",self);
+$recv($1)._on_send_to_($globals.HLProtocolsFocusRequested,"onProtocolsFocusRequested",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeModel",{},$globals.HLProtocolsListWidget)});
@@ -5517,18 +5444,16 @@ selector: "observeSystem",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $ProtocolAdded(){return $globals.ProtocolAdded||(typeof ProtocolAdded=="undefined"?nil:ProtocolAdded)}
-function $ProtocolRemoved(){return $globals.ProtocolRemoved||(typeof ProtocolRemoved=="undefined"?nil:ProtocolRemoved)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
 $1=$recv(self._model())._systemAnnouncer();
-$recv($1)._on_send_to_($ProtocolAdded(),"onProtocolAdded:",self);
+$recv($1)._on_send_to_($globals.ProtocolAdded,"onProtocolAdded:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=1;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($ProtocolRemoved(),"onProtocolRemoved:",self);
+$recv($1)._on_send_to_($globals.ProtocolRemoved,"onProtocolRemoved:",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeSystem",{},$globals.HLProtocolsListWidget)});
@@ -5853,7 +5778,6 @@ selector: "setItemsForClass:",
 protocol: 'private',
 fn: function (aClass){
 var self=this;
-function $Array(){return $globals.Array||(typeof Array=="undefined"?nil:Array)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -5863,12 +5787,12 @@ $2=self._allProtocol();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["allProtocol"]=1;
 //>>excludeEnd("ctx");
-$1=$recv($Array())._with_($2);
+$1=$recv($globals.Array)._with_($2);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["with:"]=1;
 //>>excludeEnd("ctx");
 } else {
-$3=$recv($Array())._with_(self._allProtocol());
+$3=$recv($globals.Array)._with_(self._allProtocol());
 $recv($3)._addAll_($recv(aClass)._protocols());
 $1=$recv($3)._yourself();
 };
@@ -5957,14 +5881,13 @@ selector: "classesCache",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HashedCollection(){return $globals.HashedCollection||(typeof HashedCollection=="undefined"?nil:HashedCollection)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@classesCache"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@classesCache"]=$recv($HashedCollection())._new();
+self["@classesCache"]=$recv($globals.HashedCollection)._new();
 return self["@classesCache"];
 } else {
 return $1;
@@ -6090,11 +6013,10 @@ selector: "newCacheFor:",
 protocol: 'factory',
 fn: function (aClass){
 var self=this;
-function $HLClassCache(){return $globals.HLClassCache||(typeof HLClassCache=="undefined"?nil:HLClassCache)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($HLClassCache())._on_selectorsCache_(aClass,self);
+return $recv($globals.HLClassCache)._on_selectorsCache_(aClass,self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"newCacheFor:",{aClass:aClass},$globals.HLSelectorsCache)});
 //>>excludeEnd("ctx");
@@ -6114,19 +6036,16 @@ selector: "observeSystem",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $SystemAnnouncer(){return $globals.SystemAnnouncer||(typeof SystemAnnouncer=="undefined"?nil:SystemAnnouncer)}
-function $MethodAdded(){return $globals.MethodAdded||(typeof MethodAdded=="undefined"?nil:MethodAdded)}
-function $MethodRemoved(){return $globals.MethodRemoved||(typeof MethodRemoved=="undefined"?nil:MethodRemoved)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-$1=$recv($SystemAnnouncer())._current();
-$recv($1)._on_send_to_($MethodAdded(),"onMethodAdded:",self);
+$1=$recv($globals.SystemAnnouncer)._current();
+$recv($1)._on_send_to_($globals.MethodAdded,"onMethodAdded:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=1;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($MethodRemoved(),"onMethodRemoved:",self);
+$recv($1)._on_send_to_($globals.MethodRemoved,"onMethodRemoved:",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeSystem",{},$globals.HLSelectorsCache)});

+ 3 - 6
src/Helios-Commands-Browser.js

@@ -623,7 +623,6 @@ protocol: 'executing',
 fn: function (){
 var self=this;
 var targetClass,unclassified;
-function $HLMethodClassifier(){return $globals.HLMethodClassifier||(typeof HLMethodClassifier=="undefined"?nil:HLMethodClassifier)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -637,7 +636,7 @@ return $recv($recv(e)._protocol()).__eq("as yet unclassified");
 }, function($ctx2) {$ctx2.fillBlock({e:e},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-$recv($recv($HLMethodClassifier())._new())._classifyAll_(unclassified);
+$recv($recv($globals.HLMethodClassifier)._new())._classifyAll_(unclassified);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"execute",{targetClass:targetClass,unclassified:unclassified},$globals.HLCategorizeUnclassifiedCommand)});
@@ -701,7 +700,6 @@ protocol: 'executing',
 fn: function (){
 var self=this;
 var targetClass,output,first;
-function $HLInitializeGenerator(){return $globals.HLInitializeGenerator||(typeof HLInitializeGenerator=="undefined"?nil:HLInitializeGenerator)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -711,7 +709,7 @@ $1=self._model();
 $ctx1.sendIdx["model"]=1;
 //>>excludeEnd("ctx");
 targetClass=$recv($1)._selectedClass();
-$2=$recv($HLInitializeGenerator())._new();
+$2=$recv($globals.HLInitializeGenerator)._new();
 $recv($2)._class_(targetClass);
 $recv($2)._generate();
 output=$recv($2)._output();
@@ -784,7 +782,6 @@ protocol: 'executing',
 fn: function (){
 var self=this;
 var targetClass,output;
-function $HLAccessorsGenerator(){return $globals.HLAccessorsGenerator||(typeof HLAccessorsGenerator=="undefined"?nil:HLAccessorsGenerator)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -794,7 +791,7 @@ $1=self._model();
 $ctx1.sendIdx["model"]=1;
 //>>excludeEnd("ctx");
 targetClass=$recv($1)._selectedClass();
-$2=$recv($HLAccessorsGenerator())._new();
+$2=$recv($globals.HLAccessorsGenerator)._new();
 $recv($2)._class_(targetClass);
 $recv($2)._generate();
 output=$recv($2)._output();

+ 10 - 20
src/Helios-Commands-Core.js

@@ -11,12 +11,11 @@ selector: "asActionBinding",
 protocol: 'converting',
 fn: function (){
 var self=this;
-function $HLBindingAction(){return $globals.HLBindingAction||(typeof HLBindingAction=="undefined"?nil:HLBindingAction)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-$1=$recv($HLBindingAction())._on_labelled_(self._keyCode(),self._label());
+$1=$recv($globals.HLBindingAction)._on_labelled_(self._keyCode(),self._label());
 $recv($1)._command_(self);
 return $recv($1)._yourself();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -67,11 +66,10 @@ selector: "asGroupBinding",
 protocol: 'converting',
 fn: function (){
 var self=this;
-function $HLBindingGroup(){return $globals.HLBindingGroup||(typeof HLBindingGroup=="undefined"?nil:HLBindingGroup)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($HLBindingGroup())._on_labelled_(self._keyCode(),self._label());
+return $recv($globals.HLBindingGroup)._on_labelled_(self._keyCode(),self._label());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"asGroupBinding",{},$globals.HLCommand)});
 //>>excludeEnd("ctx");
@@ -453,12 +451,11 @@ protocol: 'registration',
 fn: function (){
 var self=this;
 var classes;
-function $OrderedCollection(){return $globals.OrderedCollection||(typeof OrderedCollection=="undefined"?nil:OrderedCollection)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-classes=$recv($OrderedCollection())._new();
+classes=$recv($globals.OrderedCollection)._new();
 $1=self._isConcrete();
 if($core.assert($1)){
 $recv(classes)._add_(self);
@@ -677,11 +674,10 @@ selector: "execute",
 protocol: 'executing',
 fn: function (){
 var self=this;
-function $HLManager(){return $globals.HLManager||(typeof HLManager=="undefined"?nil:HLManager)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($recv($HLManager())._current())._removeActiveTab();
+$recv($recv($globals.HLManager)._current())._removeActiveTab();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"execute",{},$globals.HLCloseTabCommand)});
@@ -916,11 +912,10 @@ selector: "execute",
 protocol: 'executing',
 fn: function (){
 var self=this;
-function $HLBrowser(){return $globals.HLBrowser||(typeof HLBrowser=="undefined"?nil:HLBrowser)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($HLBrowser())._openAsTab();
+return $recv($globals.HLBrowser)._openAsTab();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"execute",{},$globals.HLOpenBrowserCommand)});
 //>>excludeEnd("ctx");
@@ -979,11 +974,10 @@ selector: "execute",
 protocol: 'executing',
 fn: function (){
 var self=this;
-function $HLSUnit(){return $globals.HLSUnit||(typeof HLSUnit=="undefined"?nil:HLSUnit)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($HLSUnit())._openAsTab();
+return $recv($globals.HLSUnit)._openAsTab();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"execute",{},$globals.HLOpenSUnitCommand)});
 //>>excludeEnd("ctx");
@@ -1042,11 +1036,10 @@ selector: "execute",
 protocol: 'executing',
 fn: function (){
 var self=this;
-function $HLWorkspace(){return $globals.HLWorkspace||(typeof HLWorkspace=="undefined"?nil:HLWorkspace)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($HLWorkspace())._openAsTab();
+return $recv($globals.HLWorkspace)._openAsTab();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"execute",{},$globals.HLOpenWorkspaceCommand)});
 //>>excludeEnd("ctx");
@@ -1106,7 +1099,6 @@ protocol: 'executing',
 fn: function (){
 var self=this;
 var activeTab;
-function $HLTabSelectionWidget(){return $globals.HLTabSelectionWidget||(typeof HLTabSelectionWidget=="undefined"?nil:HLTabSelectionWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1115,7 +1107,7 @@ activeTab=self._selectedTab();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["selectedTab"]=1;
 //>>excludeEnd("ctx");
-$1=$recv($HLTabSelectionWidget())._new();
+$1=$recv($globals.HLTabSelectionWidget)._new();
 $recv($1)._tabs_(self._tabs());
 $recv($1)._selectedTab_(self._selectedTab());
 $recv($1)._selectCallback_((function(tab){
@@ -1168,11 +1160,10 @@ selector: "selectedTab",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLManager(){return $globals.HLManager||(typeof HLManager=="undefined"?nil:HLManager)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($recv($HLManager())._current())._activeTab();
+return $recv($recv($globals.HLManager)._current())._activeTab();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selectedTab",{},$globals.HLSwitchTabCommand)});
 //>>excludeEnd("ctx");
@@ -1192,11 +1183,10 @@ selector: "tabs",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLManager(){return $globals.HLManager||(typeof HLManager=="undefined"?nil:HLManager)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($recv($HLManager())._current())._tabs();
+return $recv($recv($globals.HLManager)._current())._tabs();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"tabs",{},$globals.HLSwitchTabCommand)});
 //>>excludeEnd("ctx");

+ 1 - 2
src/Helios-Commands-SUnit.js

@@ -15,11 +15,10 @@ selector: "isValidFor:",
 protocol: 'testing',
 fn: function (aModel){
 var self=this;
-function $HLSUnitModel(){return $globals.HLSUnitModel||(typeof HLSUnitModel=="undefined"?nil:HLSUnitModel)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv(aModel)._isKindOf_($HLSUnitModel());
+return $recv(aModel)._isKindOf_($globals.HLSUnitModel);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"isValidFor:",{aModel:aModel},$globals.HLSUnitCommand.klass)});
 //>>excludeEnd("ctx");

+ 3 - 6
src/Helios-Commands-Tools.js

@@ -267,12 +267,11 @@ selector: "informSuccess",
 protocol: 'executing',
 fn: function (){
 var self=this;
-function $HLInformationWidget(){return $globals.HLInformationWidget||(typeof HLInformationWidget=="undefined"?nil:HLInformationWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-$1=$recv($HLInformationWidget())._new();
+$1=$recv($globals.HLInformationWidget)._new();
 $recv($1)._informationString_("Commit successful!");
 $recv($1)._show();
 return self;
@@ -313,11 +312,10 @@ selector: "onPackageCommitError:",
 protocol: 'error handling',
 fn: function (anError){
 var self=this;
-function $HLPackageCommitErrorHelper(){return $globals.HLPackageCommitErrorHelper||(typeof HLPackageCommitErrorHelper=="undefined"?nil:HLPackageCommitErrorHelper)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($recv($HLPackageCommitErrorHelper())._on_(self._model()))._showHelp();
+$recv($recv($globals.HLPackageCommitErrorHelper)._on_(self._model()))._showHelp();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"onPackageCommitError:",{anError:anError},$globals.HLCommitPackageCommand)});
@@ -837,12 +835,11 @@ selector: "execute",
 protocol: 'executing',
 fn: function (){
 var self=this;
-function $HLReferences(){return $globals.HLReferences||(typeof HLReferences=="undefined"?nil:HLReferences)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-$1=$recv($HLReferences())._new();
+$1=$recv($globals.HLReferences)._new();
 $recv($1)._openAsTab();
 $recv($1)._search_(self._input());
 return self;

+ 65 - 129
src/Helios-Core.js

@@ -14,14 +14,13 @@ selector: "announcer",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $Announcer(){return $globals.Announcer||(typeof Announcer=="undefined"?nil:Announcer)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@announcer"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@announcer"]=$recv($Announcer())._new();
+self["@announcer"]=$recv($globals.Announcer)._new();
 return self["@announcer"];
 } else {
 return $1;
@@ -147,11 +146,10 @@ selector: "manager",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLManager(){return $globals.HLManager||(typeof HLManager=="undefined"?nil:HLManager)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($HLManager())._current();
+return $recv($globals.HLManager)._current();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"manager",{},$globals.HLModel)});
 //>>excludeEnd("ctx");
@@ -194,8 +192,6 @@ selector: "withChangesDo:",
 protocol: 'error handling',
 fn: function (aBlock){
 var self=this;
-function $HLAboutToChange(){return $globals.HLAboutToChange||(typeof HLAboutToChange=="undefined"?nil:HLAboutToChange)}
-function $HLChangeForbidden(){return $globals.HLChangeForbidden||(typeof HLChangeForbidden=="undefined"?nil:HLChangeForbidden)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -205,7 +201,7 @@ $recv((function(){
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
 $1=self._announcer();
-$3=$recv($HLAboutToChange())._new();
+$3=$recv($globals.HLAboutToChange)._new();
 $recv($3)._actionBlock_(aBlock);
 $2=$recv($3)._yourself();
 $recv($1)._announce_($2);
@@ -213,7 +209,7 @@ return $recv(aBlock)._value();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
-}))._on_do_($HLChangeForbidden(),(function(ex){
+}))._on_do_($globals.HLChangeForbidden,(function(ex){
 
 }));
 return self;
@@ -242,11 +238,10 @@ selector: "findClass:",
 protocol: 'finding',
 fn: function (aClass){
 var self=this;
-function $HLBrowser(){return $globals.HLBrowser||(typeof HLBrowser=="undefined"?nil:HLBrowser)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($recv($HLBrowser())._openAsTab())._openClassNamed_($recv(aClass)._name());
+$recv($recv($globals.HLBrowser)._openAsTab())._openClassNamed_($recv(aClass)._name());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"findClass:",{aClass:aClass},$globals.HLFinder)});
@@ -267,11 +262,10 @@ selector: "findMethod:",
 protocol: 'finding',
 fn: function (aCompiledMethod){
 var self=this;
-function $HLBrowser(){return $globals.HLBrowser||(typeof HLBrowser=="undefined"?nil:HLBrowser)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($recv($HLBrowser())._openAsTab())._openMethod_(aCompiledMethod);
+$recv($recv($globals.HLBrowser)._openAsTab())._openMethod_(aCompiledMethod);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"findMethod:",{aCompiledMethod:aCompiledMethod},$globals.HLFinder)});
@@ -293,7 +287,6 @@ protocol: 'finding',
 fn: function (aString){
 var self=this;
 var foundClass;
-function $HLReferences(){return $globals.HLReferences||(typeof HLReferences=="undefined"?nil:HLReferences)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -312,7 +305,7 @@ return nil;
 }));
 $1=foundClass;
 if(($receiver = $1) == null || $receiver.isNil){
-$recv($recv($HLReferences())._openAsTab())._search_(aString);
+$recv($recv($globals.HLReferences)._openAsTab())._search_(aString);
 } else {
 self._findClass_(foundClass);
 };
@@ -342,7 +335,6 @@ selector: "addInstVarNamed:",
 protocol: 'actions',
 fn: function (aString){
 var self=this;
-function $HLInstVarAdded(){return $globals.HLInstVarAdded||(typeof HLInstVarAdded=="undefined"?nil:HLInstVarAdded)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -354,7 +346,7 @@ $ctx1.sendIdx["selectedClass"]=1;
 //>>excludeEnd("ctx");
 $recv($1)._addInstVarNamed_to_(aString,$2);
 $3=self._announcer();
-$5=$recv($HLInstVarAdded())._new();
+$5=$recv($globals.HLInstVarAdded)._new();
 $recv($5)._theClass_(self._selectedClass());
 $recv($5)._variableName_(aString);
 $4=$recv($5)._yourself();
@@ -852,13 +844,12 @@ selector: "handleCompileError:",
 protocol: 'error handling',
 fn: function (anError){
 var self=this;
-function $HLCompileErrorRaised(){return $globals.HLCompileErrorRaised||(typeof HLCompileErrorRaised=="undefined"?nil:HLCompileErrorRaised)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$3,$2;
 $1=self._announcer();
-$3=$recv($HLCompileErrorRaised())._new();
+$3=$recv($globals.HLCompileErrorRaised)._new();
 $recv($3)._error_(anError);
 $2=$recv($3)._yourself();
 $recv($1)._announce_($2);
@@ -883,7 +874,6 @@ protocol: 'error handling',
 fn: function (anError){
 var self=this;
 var split,line,column,messageToInsert;
-function $HLParseErrorRaised(){return $globals.HLParseErrorRaised||(typeof HLParseErrorRaised=="undefined"?nil:HLParseErrorRaised)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -910,7 +900,7 @@ split=$recv(split)._tokenize_(" column ");
 line=$recv(split)._first();
 column=$recv(split)._second();
 $4=self._announcer();
-$6=$recv($HLParseErrorRaised())._new();
+$6=$recv($globals.HLParseErrorRaised)._new();
 $7=$recv(line)._asNumber();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["asNumber"]=1;
@@ -941,13 +931,12 @@ selector: "handleUnkownVariableError:",
 protocol: 'error handling',
 fn: function (anError){
 var self=this;
-function $HLUnknownVariableErrorRaised(){return $globals.HLUnknownVariableErrorRaised||(typeof HLUnknownVariableErrorRaised=="undefined"?nil:HLUnknownVariableErrorRaised)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$3,$2;
 $1=self._announcer();
-$3=$recv($HLUnknownVariableErrorRaised())._new();
+$3=$recv($globals.HLUnknownVariableErrorRaised)._new();
 $recv($3)._error_(anError);
 $2=$recv($3)._yourself();
 $recv($1)._announce_($2);
@@ -1432,12 +1421,11 @@ selector: "save:",
 protocol: 'actions',
 fn: function (aString){
 var self=this;
-function $HLSourceCodeSaved(){return $globals.HLSourceCodeSaved||(typeof HLSourceCodeSaved=="undefined"?nil:HLSourceCodeSaved)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-$recv(self._announcer())._announce_($recv($HLSourceCodeSaved())._new());
+$recv(self._announcer())._announce_($recv($globals.HLSourceCodeSaved)._new());
 $1=self._shouldCompileDefinition_(aString);
 if($core.assert($1)){
 self._compileClassDefinition_(aString);
@@ -1464,11 +1452,10 @@ selector: "saveSourceCode",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLSaveSourceCode(){return $globals.HLSaveSourceCode||(typeof HLSaveSourceCode=="undefined"?nil:HLSaveSourceCode)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv(self._announcer())._announce_($recv($HLSaveSourceCode())._new());
+$recv(self._announcer())._announce_($recv($globals.HLSaveSourceCode)._new());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"saveSourceCode",{},$globals.HLToolModel)});
@@ -1507,7 +1494,6 @@ selector: "selectedClass:",
 protocol: 'accessing',
 fn: function (aClass){
 var self=this;
-function $HLClassSelected(){return $globals.HLClassSelected||(typeof HLClassSelected=="undefined"?nil:HLClassSelected)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1555,7 +1541,7 @@ self["@selectedClass"];
 self["@selectedProtocol"]=nil;
 self["@selectedProtocol"];
 self._selectedProtocol_(self._allProtocol());
-return $recv(self._announcer())._announce_($recv($HLClassSelected())._on_(self._selectedClass()));
+return $recv(self._announcer())._announce_($recv($globals.HLClassSelected)._on_(self._selectedClass()));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,3)});
 //>>excludeEnd("ctx");
@@ -1615,7 +1601,6 @@ selector: "selectedMethod:",
 protocol: 'accessing',
 fn: function (aCompiledMethod){
 var self=this;
-function $HLMethodSelected(){return $globals.HLMethodSelected||(typeof HLMethodSelected=="undefined"?nil:HLMethodSelected)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1639,7 +1624,7 @@ self["@selectedPackage"];
 self["@selectedSelector"]=$recv(aCompiledMethod)._selector();
 self["@selectedSelector"];
 };
-return $recv(self._announcer())._announce_($recv($HLMethodSelected())._on_(aCompiledMethod));
+return $recv(self._announcer())._announce_($recv($globals.HLMethodSelected)._on_(aCompiledMethod));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)});
 //>>excludeEnd("ctx");
@@ -1682,7 +1667,6 @@ selector: "selectedPackage:",
 protocol: 'accessing',
 fn: function (aPackage){
 var self=this;
-function $HLPackageSelected(){return $globals.HLPackageSelected||(typeof HLPackageSelected=="undefined"?nil:HLPackageSelected)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1698,7 +1682,7 @@ return $core.withContext(function($ctx2) {
 self["@selectedPackage"]=aPackage;
 self["@selectedPackage"];
 self._selectedClass_(nil);
-return $recv(self._announcer())._announce_($recv($HLPackageSelected())._on_(aPackage));
+return $recv(self._announcer())._announce_($recv($globals.HLPackageSelected)._on_(aPackage));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)});
 //>>excludeEnd("ctx");
@@ -1741,7 +1725,6 @@ selector: "selectedProtocol:",
 protocol: 'accessing',
 fn: function (aString){
 var self=this;
-function $HLProtocolSelected(){return $globals.HLProtocolSelected||(typeof HLProtocolSelected=="undefined"?nil:HLProtocolSelected)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1757,7 +1740,7 @@ return $core.withContext(function($ctx2) {
 self["@selectedProtocol"]=aString;
 self["@selectedProtocol"];
 self._selectedMethod_(nil);
-return $recv(self._announcer())._announce_($recv($HLProtocolSelected())._on_(aString));
+return $recv(self._announcer())._announce_($recv($globals.HLProtocolSelected)._on_(aString));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)});
 //>>excludeEnd("ctx");
@@ -1831,9 +1814,6 @@ selector: "withCompileErrorHandling:",
 protocol: 'error handling',
 fn: function (aBlock){
 var self=this;
-function $ParseError(){return $globals.ParseError||(typeof ParseError=="undefined"?nil:ParseError)}
-function $UnknownVariableError(){return $globals.UnknownVariableError||(typeof UnknownVariableError=="undefined"?nil:UnknownVariableError)}
-function $CompilerError(){return $globals.CompilerError||(typeof CompilerError=="undefined"?nil:CompilerError)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1854,7 +1834,7 @@ return $recv($2)._evaluate_on_do_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx3) {
 //>>excludeEnd("ctx");
-return $recv(self._environment())._evaluate_on_do_(aBlock,$ParseError(),(function(ex){
+return $recv(self._environment())._evaluate_on_do_(aBlock,$globals.ParseError,(function(ex){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx4) {
 //>>excludeEnd("ctx");
@@ -1866,7 +1846,7 @@ return self._handleParseError_(ex);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx3) {$ctx3.fillBlock({},$ctx2,2)});
 //>>excludeEnd("ctx");
-}),$UnknownVariableError(),(function(ex){
+}),$globals.UnknownVariableError,(function(ex){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx3) {
 //>>excludeEnd("ctx");
@@ -1881,7 +1861,7 @@ $ctx2.sendIdx["evaluate:on:do:"]=2;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
-}),$CompilerError(),(function(ex){
+}),$globals.CompilerError,(function(ex){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -2003,11 +1983,10 @@ selector: "do:on:displaying:",
 protocol: 'progress handling',
 fn: function (aBlock,aCollection,aString){
 var self=this;
-function $HLProgressWidget(){return $globals.HLProgressWidget||(typeof HLProgressWidget=="undefined"?nil:HLProgressWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($recv($HLProgressWidget())._default())._do_on_displaying_(aBlock,aCollection,aString);
+$recv($recv($globals.HLProgressWidget)._default())._do_on_displaying_(aBlock,aCollection,aString);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"do:on:displaying:",{aBlock:aBlock,aCollection:aCollection,aString:aString},$globals.HLProgressHandler)});
@@ -2173,12 +2152,11 @@ selector: "execute:",
 protocol: 'actions',
 fn: function (aCommand){
 var self=this;
-function $HLManager(){return $globals.HLManager||(typeof HLManager=="undefined"?nil:HLManager)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-$1=$recv($recv($HLManager())._current())._keyBinder();
+$1=$recv($recv($globals.HLManager)._current())._keyBinder();
 $recv($1)._activate();
 $recv($1)._applyBinding_($recv(aCommand)._asBinding());
 return self;
@@ -2225,11 +2203,10 @@ selector: "manager",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLManager(){return $globals.HLManager||(typeof HLManager=="undefined"?nil:HLManager)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($HLManager())._current();
+return $recv($globals.HLManager)._current();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"manager",{},$globals.HLWidget)});
 //>>excludeEnd("ctx");
@@ -2249,11 +2226,10 @@ selector: "openAsTab",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLTabWidget(){return $globals.HLTabWidget||(typeof HLTabWidget=="undefined"?nil:HLTabWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($recv($HLTabWidget())._on_labelled_(self,self._defaultTabLabel()))._add();
+$recv($recv($globals.HLTabWidget)._on_labelled_(self,self._defaultTabLabel()))._add();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"openAsTab",{},$globals.HLWidget)});
@@ -2482,13 +2458,12 @@ selector: "setTabLabel:",
 protocol: 'accessing',
 fn: function (aString){
 var self=this;
-function $HLTabLabelChanged(){return $globals.HLTabLabelChanged||(typeof HLTabLabelChanged=="undefined"?nil:HLTabLabelChanged)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$3,$2;
 $1=$recv(self._manager())._announcer();
-$3=$recv($HLTabLabelChanged())._new();
+$3=$recv($globals.HLTabLabelChanged)._new();
 $recv($3)._widget_(self);
 $recv($3)._label_(aString);
 $2=$recv($3)._yourself();
@@ -2622,12 +2597,11 @@ protocol: 'accessing',
 fn: function (){
 var self=this;
 var instance;
-function $HLTabWidget(){return $globals.HLTabWidget||(typeof HLTabWidget=="undefined"?nil:HLTabWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 instance=self._new();
-$recv($recv($HLTabWidget())._on_labelled_(instance,$recv(instance)._defaultTabLabel()))._add();
+$recv($recv($globals.HLTabWidget)._on_labelled_(instance,$recv(instance)._defaultTabLabel()))._add();
 return instance;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"openAsTab",{instance:instance},$globals.HLWidget.klass)});
@@ -3829,12 +3803,11 @@ selector: "setupKeyBindings",
 protocol: 'events',
 fn: function (){
 var self=this;
-function $HLRepeatedKeyDownHandler(){return $globals.HLRepeatedKeyDownHandler||(typeof HLRepeatedKeyDownHandler=="undefined"?nil:HLRepeatedKeyDownHandler)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$2;
-$1=$recv($HLRepeatedKeyDownHandler())._on_(self);
+$1=$recv($globals.HLRepeatedKeyDownHandler)._on_(self);
 $recv($1)._whileKeyDown_do_((38),(function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
@@ -4273,12 +4246,11 @@ selector: "menuCommands",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLToolCommand(){return $globals.HLToolCommand||(typeof HLToolCommand=="undefined"?nil:HLToolCommand)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $2,$1;
-$1=$recv($recv($recv($recv($HLToolCommand())._concreteClasses())._select_((function(each){
+$1=$recv($recv($recv($recv($globals.HLToolCommand)._concreteClasses())._select_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -5154,14 +5126,13 @@ selector: "announcer",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $Announcer(){return $globals.Announcer||(typeof Announcer=="undefined"?nil:Announcer)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@announcer"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@announcer"]=$recv($Announcer())._new();
+self["@announcer"]=$recv($globals.Announcer)._new();
 return self["@announcer"];
 } else {
 return $1;
@@ -5237,12 +5208,11 @@ selector: "confirm:ifTrue:ifFalse:",
 protocol: 'actions',
 fn: function (aString,aBlock,anotherBlock){
 var self=this;
-function $HLConfirmationWidget(){return $globals.HLConfirmationWidget||(typeof HLConfirmationWidget=="undefined"?nil:HLConfirmationWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-$1=$recv($HLConfirmationWidget())._new();
+$1=$recv($globals.HLConfirmationWidget)._new();
 $recv($1)._confirmationString_(aString);
 $recv($1)._actionBlock_(aBlock);
 $recv($1)._cancelBlock_(anotherBlock);
@@ -5268,8 +5238,6 @@ protocol: 'defaults',
 fn: function (){
 var self=this;
 var parent,parentSmalltalkGlobals;
-function $Environment(){return $globals.Environment||(typeof Environment=="undefined"?nil:Environment)}
-function $Error(){return $globals.Error||(typeof Error=="undefined"?nil:Error)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -5282,7 +5250,7 @@ parent=$1;
 };
 $2=parent;
 if(($receiver = $2) == null || $receiver.isNil){
-$3=$recv($Environment())._new();
+$3=$recv($globals.Environment)._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=1;
 //>>excludeEnd("ctx");
@@ -5310,7 +5278,7 @@ return parentSmalltalkGlobals;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,3)});
 //>>excludeEnd("ctx");
-}))._on_do_($Error(),(function(){
+}))._on_do_($globals.Error,(function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -5326,7 +5294,7 @@ return parentSmalltalkGlobals;
 }));
 $7=parentSmalltalkGlobals;
 if(($receiver = $7) == null || $receiver.isNil){
-$8=$recv($Environment())._new();
+$8=$recv($globals.Environment)._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=2;
 //>>excludeEnd("ctx");
@@ -5437,14 +5405,13 @@ selector: "history",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $OrderedCollection(){return $globals.OrderedCollection||(typeof OrderedCollection=="undefined"?nil:OrderedCollection)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@history"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@history"]=$recv($OrderedCollection())._new();
+self["@history"]=$recv($globals.OrderedCollection)._new();
 return self["@history"];
 } else {
 return $1;
@@ -5487,12 +5454,11 @@ selector: "inform:",
 protocol: 'actions',
 fn: function (aString){
 var self=this;
-function $HLInformationWidget(){return $globals.HLInformationWidget||(typeof HLInformationWidget=="undefined"?nil:HLInformationWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-$1=$recv($HLInformationWidget())._new();
+$1=$recv($globals.HLInformationWidget)._new();
 $recv($1)._informationString_(aString);
 $recv($1)._show();
 return self;
@@ -5547,11 +5513,10 @@ selector: "keyBinder",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLKeyBinder(){return $globals.HLKeyBinder||(typeof HLKeyBinder=="undefined"?nil:HLKeyBinder)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($HLKeyBinder())._current();
+return $recv($globals.HLKeyBinder)._current();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"keyBinder",{},$globals.HLManager)});
 //>>excludeEnd("ctx");
@@ -5571,19 +5536,17 @@ selector: "registerErrorHandler",
 protocol: 'services',
 fn: function (){
 var self=this;
-function $HLErrorHandler(){return $globals.HLErrorHandler||(typeof HLErrorHandler=="undefined"?nil:HLErrorHandler)}
-function $ErrorHandler(){return $globals.ErrorHandler||(typeof ErrorHandler=="undefined"?nil:ErrorHandler)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$2;
 $1=self._environment();
-$2=$recv($HLErrorHandler())._new();
+$2=$recv($globals.HLErrorHandler)._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=1;
 //>>excludeEnd("ctx");
 $recv($1)._registerErrorHandler_($2);
-$recv($ErrorHandler())._register_($recv($HLErrorHandler())._new());
+$recv($globals.ErrorHandler)._register_($recv($globals.HLErrorHandler)._new());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"registerErrorHandler",{},$globals.HLManager)});
@@ -5604,19 +5567,17 @@ selector: "registerFinder",
 protocol: 'services',
 fn: function (){
 var self=this;
-function $HLFinder(){return $globals.HLFinder||(typeof HLFinder=="undefined"?nil:HLFinder)}
-function $Finder(){return $globals.Finder||(typeof Finder=="undefined"?nil:Finder)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$2;
 $1=self._environment();
-$2=$recv($HLFinder())._new();
+$2=$recv($globals.HLFinder)._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=1;
 //>>excludeEnd("ctx");
 $recv($1)._registerFinder_($2);
-$recv($Finder())._register_($recv($HLFinder())._new());
+$recv($globals.Finder)._register_($recv($globals.HLFinder)._new());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"registerFinder",{},$globals.HLManager)});
@@ -5637,13 +5598,11 @@ selector: "registerInspector",
 protocol: 'services',
 fn: function (){
 var self=this;
-function $HLInspector(){return $globals.HLInspector||(typeof HLInspector=="undefined"?nil:HLInspector)}
-function $Inspector(){return $globals.Inspector||(typeof Inspector=="undefined"?nil:Inspector)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv(self._environment())._registerInspector_($HLInspector());
-$recv($Inspector())._register_($HLInspector());
+$recv(self._environment())._registerInspector_($globals.HLInspector);
+$recv($globals.Inspector)._register_($globals.HLInspector);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"registerInspector",{},$globals.HLManager)});
@@ -5664,19 +5623,17 @@ selector: "registerProgressHandler",
 protocol: 'services',
 fn: function (){
 var self=this;
-function $HLProgressHandler(){return $globals.HLProgressHandler||(typeof HLProgressHandler=="undefined"?nil:HLProgressHandler)}
-function $ProgressHandler(){return $globals.ProgressHandler||(typeof ProgressHandler=="undefined"?nil:ProgressHandler)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$2;
 $1=self._environment();
-$2=$recv($HLProgressHandler())._new();
+$2=$recv($globals.HLProgressHandler)._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=1;
 //>>excludeEnd("ctx");
 $recv($1)._registerProgressHandler_($2);
-$recv($ProgressHandler())._register_($recv($HLProgressHandler())._new());
+$recv($globals.ProgressHandler)._register_($recv($globals.HLProgressHandler)._new());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"registerProgressHandler",{},$globals.HLManager)});
@@ -5725,11 +5682,10 @@ selector: "registerTranscript",
 protocol: 'services',
 fn: function (){
 var self=this;
-function $HLTranscriptHandler(){return $globals.HLTranscriptHandler||(typeof HLTranscriptHandler=="undefined"?nil:HLTranscriptHandler)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv(self._environment())._registerTranscript_($HLTranscriptHandler());
+$recv(self._environment())._registerTranscript_($globals.HLTranscriptHandler);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"registerTranscript",{},$globals.HLManager)});
@@ -5822,7 +5778,6 @@ selector: "renderContentOn:",
 protocol: 'rendering',
 fn: function (html){
 var self=this;
-function $HLWelcomeWidget(){return $globals.HLWelcomeWidget||(typeof HLWelcomeWidget=="undefined"?nil:HLWelcomeWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -5830,7 +5785,7 @@ $recv(html)._with_(self._tabsWidget());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["with:"]=1;
 //>>excludeEnd("ctx");
-$recv(html)._with_($recv($HLWelcomeWidget())._new());
+$recv(html)._with_($recv($globals.HLWelcomeWidget)._new());
 self._renderDefaultTabs();
 self["@rendered"]=true;
 return self;
@@ -5853,19 +5808,17 @@ selector: "renderDefaultTabs",
 protocol: 'rendering',
 fn: function (){
 var self=this;
-function $HLWorkspace(){return $globals.HLWorkspace||(typeof HLWorkspace=="undefined"?nil:HLWorkspace)}
-function $HLBrowser(){return $globals.HLBrowser||(typeof HLBrowser=="undefined"?nil:HLBrowser)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
 $1=self["@rendered"];
 if(!$core.assert($1)){
-$recv($HLWorkspace())._openAsTab();
+$recv($globals.HLWorkspace)._openAsTab();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["openAsTab"]=1;
 //>>excludeEnd("ctx");
-$recv($HLBrowser())._openAsTab();
+$recv($globals.HLBrowser)._openAsTab();
 };
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -5911,12 +5864,11 @@ selector: "request:value:do:",
 protocol: 'actions',
 fn: function (aString,valueString,aBlock){
 var self=this;
-function $HLRequestWidget(){return $globals.HLRequestWidget||(typeof HLRequestWidget=="undefined"?nil:HLRequestWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-$1=$recv($HLRequestWidget())._new();
+$1=$recv($globals.HLRequestWidget)._new();
 $recv($1)._confirmationString_(aString);
 $recv($1)._actionBlock_(aBlock);
 $recv($1)._value_(valueString);
@@ -6172,14 +6124,13 @@ selector: "tabsWidget",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLTabsWidget(){return $globals.HLTabsWidget||(typeof HLTabsWidget=="undefined"?nil:HLTabsWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@tabsWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@tabsWidget"]=$recv($HLTabsWidget())._new();
+self["@tabsWidget"]=$recv($globals.HLTabsWidget)._new();
 return self["@tabsWidget"];
 } else {
 return $1;
@@ -6469,7 +6420,6 @@ selector: "setupKeyBindings",
 protocol: 'rendering',
 fn: function (){
 var self=this;
-function $String(){return $globals.String||(typeof String=="undefined"?nil:String)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -6478,7 +6428,7 @@ $recv(".dialog"._asJQuery())._keyup_((function(e){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-$1=$recv($recv(e)._keyCode()).__eq($recv($recv($String())._esc())._asciiValue());
+$1=$recv($recv(e)._keyCode()).__eq($recv($recv($globals.String)._esc())._asciiValue());
 if($core.assert($1)){
 return self._cancel();
 };
@@ -7215,12 +7165,11 @@ protocol: 'actions',
 fn: function (aBlock,aCollection,aString){
 var self=this;
 var progressBar;
-function $HLProgressBarWidget(){return $globals.HLProgressBarWidget||(typeof HLProgressBarWidget=="undefined"?nil:HLProgressBarWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-$1=$recv($HLProgressBarWidget())._new();
+$1=$recv($globals.HLProgressBarWidget)._new();
 $recv($1)._parent_(self);
 $recv($1)._label_(aString);
 $recv($1)._workBlock_(aBlock);
@@ -7327,14 +7276,13 @@ selector: "progressBars",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $OrderedCollection(){return $globals.OrderedCollection||(typeof OrderedCollection=="undefined"?nil:OrderedCollection)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@progressBars"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@progressBars"]=$recv($OrderedCollection())._new();
+self["@progressBars"]=$recv($globals.OrderedCollection)._new();
 return self["@progressBars"];
 } else {
 return $1;
@@ -8039,7 +7987,6 @@ selector: "setupKeyBindings",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $String(){return $globals.String||(typeof String=="undefined"?nil:String)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -8056,7 +8003,7 @@ $recv(".dialog"._asJQuery())._keyup_((function(e){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-$1=$recv($recv(e)._keyCode()).__eq($recv($recv($String())._cr())._asciiValue());
+$1=$recv($recv(e)._keyCode()).__eq($recv($recv($globals.String)._cr())._asciiValue());
 if($core.assert($1)){
 return self._confirm();
 };
@@ -8084,14 +8031,13 @@ selector: "tabList",
 protocol: 'rendering',
 fn: function (){
 var self=this;
-function $HLTabListWidget(){return $globals.HLTabListWidget||(typeof HLTabListWidget=="undefined"?nil:HLTabListWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$2,$receiver;
 $1=self["@tabList"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@tabList"]=$recv($HLTabListWidget())._new();
+self["@tabList"]=$recv($globals.HLTabListWidget)._new();
 self["@tabList"];
 $2=self["@tabList"];
 $recv($2)._callback_((function(tab){
@@ -8705,7 +8651,6 @@ selector: "search:",
 protocol: 'actions',
 fn: function (aString){
 var self=this;
-function $Finder(){return $globals.Finder||(typeof Finder=="undefined"?nil:Finder)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -8713,7 +8658,7 @@ $recv(aString)._ifNotEmpty_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-return $recv($Finder())._findString_(aString);
+return $recv($globals.Finder)._findString_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
@@ -8949,11 +8894,10 @@ selector: "manager",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLManager(){return $globals.HLManager||(typeof HLManager=="undefined"?nil:HLManager)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($HLManager())._current();
+return $recv($globals.HLManager)._current();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"manager",{},$globals.HLTabWidget)});
 //>>excludeEnd("ctx");
@@ -8973,11 +8917,10 @@ selector: "observeManager",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLTabLabelChanged(){return $globals.HLTabLabelChanged||(typeof HLTabLabelChanged=="undefined"?nil:HLTabLabelChanged)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($recv(self._manager())._announcer())._on_send_to_($HLTabLabelChanged(),"onTabLabelChanged:",self);
+$recv($recv(self._manager())._announcer())._on_send_to_($globals.HLTabLabelChanged,"onTabLabelChanged:",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeManager",{},$globals.HLTabWidget)});
@@ -9554,14 +9497,13 @@ selector: "history",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $OrderedCollection(){return $globals.OrderedCollection||(typeof OrderedCollection=="undefined"?nil:OrderedCollection)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@history"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@history"]=$recv($OrderedCollection())._new();
+self["@history"]=$recv($globals.OrderedCollection)._new();
 return self["@history"];
 } else {
 return $1;
@@ -9778,7 +9720,6 @@ selector: "renderAddOn:",
 protocol: 'rendering',
 fn: function (html){
 var self=this;
-function $HLWidget(){return $globals.HLWidget||(typeof HLWidget=="undefined"?nil:HLWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -9823,7 +9764,7 @@ $6=$recv($5)._with_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx3) {
 //>>excludeEnd("ctx");
-return $recv($recv($recv($recv($HLWidget())._withAllSubclasses())._select_((function(each){
+return $recv($recv($recv($recv($globals.HLWidget)._withAllSubclasses())._select_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx4) {
 //>>excludeEnd("ctx");
@@ -10259,14 +10200,13 @@ selector: "spotlight",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLSpotlightWidget(){return $globals.HLSpotlightWidget||(typeof HLSpotlightWidget=="undefined"?nil:HLSpotlightWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@spotlight"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@spotlight"]=$recv($HLSpotlightWidget())._new();
+self["@spotlight"]=$recv($globals.HLSpotlightWidget)._new();
 return self["@spotlight"];
 } else {
 return $1;
@@ -10313,14 +10253,13 @@ selector: "tabs",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $OrderedCollection(){return $globals.OrderedCollection||(typeof OrderedCollection=="undefined"?nil:OrderedCollection)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@tabs"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@tabs"]=$recv($OrderedCollection())._new();
+self["@tabs"]=$recv($globals.OrderedCollection)._new();
 return self["@tabs"];
 } else {
 return $1;
@@ -10398,11 +10337,10 @@ selector: "openClassBrowser",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLBrowser(){return $globals.HLBrowser||(typeof HLBrowser=="undefined"?nil:HLBrowser)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($HLBrowser())._openAsTab();
+$recv($globals.HLBrowser)._openAsTab();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"openClassBrowser",{},$globals.HLWelcomeWidget)});
@@ -10441,11 +10379,10 @@ selector: "openTestRunner",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLSUnit(){return $globals.HLSUnit||(typeof HLSUnit=="undefined"?nil:HLSUnit)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($HLSUnit())._openAsTab();
+$recv($globals.HLSUnit)._openAsTab();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"openTestRunner",{},$globals.HLWelcomeWidget)});
@@ -10466,11 +10403,10 @@ selector: "openWorkspace",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLWorkspace(){return $globals.HLWorkspace||(typeof HLWorkspace=="undefined"?nil:HLWorkspace)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($HLWorkspace())._openAsTab();
+$recv($globals.HLWorkspace)._openAsTab();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"openWorkspace",{},$globals.HLWelcomeWidget)});

+ 34 - 69
src/Helios-Debugger.js

@@ -81,12 +81,11 @@ protocol: 'inspecting',
 fn: function (anInspector){
 var self=this;
 var variables,inspectedContext;
-function $Dictionary(){return $globals.Dictionary||(typeof Dictionary=="undefined"?nil:Dictionary)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$2,$3,$receiver;
-variables=$recv($Dictionary())._new();
+variables=$recv($globals.Dictionary)._new();
 inspectedContext=self._context();
 $1=variables;
 $2=$recv(inspectedContext)._locals();
@@ -183,19 +182,17 @@ selector: "codeWidget",
 protocol: 'widgets',
 fn: function (){
 var self=this;
-function $HLDebuggerCodeWidget(){return $globals.HLDebuggerCodeWidget||(typeof HLDebuggerCodeWidget=="undefined"?nil:HLDebuggerCodeWidget)}
-function $HLDebuggerCodeModel(){return $globals.HLDebuggerCodeModel||(typeof HLDebuggerCodeModel=="undefined"?nil:HLDebuggerCodeModel)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$2,$4,$5,$6,$3,$receiver;
 $1=self["@codeWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-$2=$recv($HLDebuggerCodeWidget())._new();
+$2=$recv($globals.HLDebuggerCodeWidget)._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=1;
 //>>excludeEnd("ctx");
-$4=$recv($HLDebuggerCodeModel())._new();
+$4=$recv($globals.HLDebuggerCodeModel)._new();
 $5=self._model();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["model"]=1;
@@ -288,11 +285,10 @@ selector: "initializeFromError:",
 protocol: 'initialization',
 fn: function (anError){
 var self=this;
-function $HLDebuggerModel(){return $globals.HLDebuggerModel||(typeof HLDebuggerModel=="undefined"?nil:HLDebuggerModel)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-self["@model"]=$recv($HLDebuggerModel())._on_(anError);
+self["@model"]=$recv($globals.HLDebuggerModel)._on_(anError);
 self._observeModel();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -314,14 +310,13 @@ selector: "inspectorWidget",
 protocol: 'widgets',
 fn: function (){
 var self=this;
-function $HLInspectorWidget(){return $globals.HLInspectorWidget||(typeof HLInspectorWidget=="undefined"?nil:HLInspectorWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@inspectorWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@inspectorWidget"]=$recv($HLInspectorWidget())._new();
+self["@inspectorWidget"]=$recv($globals.HLInspectorWidget)._new();
 return self["@inspectorWidget"];
 } else {
 return $1;
@@ -345,14 +340,13 @@ selector: "model",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLDebuggerModel(){return $globals.HLDebuggerModel||(typeof HLDebuggerModel=="undefined"?nil:HLDebuggerModel)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@model"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@model"]=$recv($HLDebuggerModel())._new();
+self["@model"]=$recv($globals.HLDebuggerModel)._new();
 return self["@model"];
 } else {
 return $1;
@@ -376,23 +370,20 @@ selector: "observeModel",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLDebuggerContextSelected(){return $globals.HLDebuggerContextSelected||(typeof HLDebuggerContextSelected=="undefined"?nil:HLDebuggerContextSelected)}
-function $HLDebuggerStepped(){return $globals.HLDebuggerStepped||(typeof HLDebuggerStepped=="undefined"?nil:HLDebuggerStepped)}
-function $HLDebuggerProceeded(){return $globals.HLDebuggerProceeded||(typeof HLDebuggerProceeded=="undefined"?nil:HLDebuggerProceeded)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
 $1=$recv(self._model())._announcer();
-$recv($1)._on_send_to_($HLDebuggerContextSelected(),"onContextSelected:",self);
+$recv($1)._on_send_to_($globals.HLDebuggerContextSelected,"onContextSelected:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=1;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLDebuggerStepped(),"onDebuggerStepped:",self);
+$recv($1)._on_send_to_($globals.HLDebuggerStepped,"onDebuggerStepped:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=2;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLDebuggerProceeded(),"onDebuggerProceeded",self);
+$recv($1)._on_send_to_($globals.HLDebuggerProceeded,"onDebuggerProceeded",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeModel",{},$globals.HLDebugger)});
@@ -413,11 +404,10 @@ selector: "onContextSelected:",
 protocol: 'reactions',
 fn: function (anAnnouncement){
 var self=this;
-function $HLContextInspectorDecorator(){return $globals.HLContextInspectorDecorator||(typeof HLContextInspectorDecorator=="undefined"?nil:HLContextInspectorDecorator)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv(self._inspectorWidget())._inspect_($recv($HLContextInspectorDecorator())._on_($recv(anAnnouncement)._context()));
+$recv(self._inspectorWidget())._inspect_($recv($globals.HLContextInspectorDecorator)._on_($recv(anAnnouncement)._context()));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"onContextSelected:",{anAnnouncement:anAnnouncement},$globals.HLDebugger)});
@@ -462,7 +452,6 @@ selector: "onDebuggerStepped:",
 protocol: 'reactions',
 fn: function (anAnnouncement){
 var self=this;
-function $HLContextInspectorDecorator(){return $globals.HLContextInspectorDecorator||(typeof HLContextInspectorDecorator=="undefined"?nil:HLContextInspectorDecorator)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -471,7 +460,7 @@ $1=$recv(self._model())._atEnd();
 if($core.assert($1)){
 self._removeTab();
 };
-$recv(self._inspectorWidget())._inspect_($recv($HLContextInspectorDecorator())._on_($recv(anAnnouncement)._context()));
+$recv(self._inspectorWidget())._inspect_($recv($globals.HLContextInspectorDecorator)._on_($recv(anAnnouncement)._context()));
 $recv(self._stackListWidget())._refresh();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -493,11 +482,10 @@ selector: "registerBindingsOn:",
 protocol: 'keybindings',
 fn: function (aBindingGroup){
 var self=this;
-function $HLToolCommand(){return $globals.HLToolCommand||(typeof HLToolCommand=="undefined"?nil:HLToolCommand)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($HLToolCommand())._registerConcreteClassesOn_for_(aBindingGroup,self._model());
+$recv($globals.HLToolCommand)._registerConcreteClassesOn_for_(aBindingGroup,self._model());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"registerBindingsOn:",{aBindingGroup:aBindingGroup},$globals.HLDebugger)});
@@ -518,19 +506,16 @@ selector: "renderContentOn:",
 protocol: 'rendering',
 fn: function (html){
 var self=this;
-function $HLContainer(){return $globals.HLContainer||(typeof HLContainer=="undefined"?nil:HLContainer)}
-function $HLVerticalSplitter(){return $globals.HLVerticalSplitter||(typeof HLVerticalSplitter=="undefined"?nil:HLVerticalSplitter)}
-function $HLHorizontalSplitter(){return $globals.HLHorizontalSplitter||(typeof HLHorizontalSplitter=="undefined"?nil:HLHorizontalSplitter)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $2,$1;
 self._renderHeadOn_(html);
-$2=$recv($HLVerticalSplitter())._with_with_(self._codeWidget(),$recv($HLHorizontalSplitter())._with_with_(self._stackListWidget(),self._inspectorWidget()));
+$2=$recv($globals.HLVerticalSplitter)._with_with_(self._codeWidget(),$recv($globals.HLHorizontalSplitter)._with_with_(self._stackListWidget(),self._inspectorWidget()));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["with:with:"]=1;
 //>>excludeEnd("ctx");
-$1=$recv($HLContainer())._with_($2);
+$1=$recv($globals.HLContainer)._with_($2);
 $recv(html)._with_($1);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["with:"]=1;
@@ -593,14 +578,13 @@ selector: "stackListWidget",
 protocol: 'widgets',
 fn: function (){
 var self=this;
-function $HLStackListWidget(){return $globals.HLStackListWidget||(typeof HLStackListWidget=="undefined"?nil:HLStackListWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$2,$receiver;
 $1=self["@stackListWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-$2=$recv($HLStackListWidget())._on_(self._model());
+$2=$recv($globals.HLStackListWidget)._on_(self._model());
 $recv($2)._next_(self._codeWidget());
 self["@stackListWidget"]=$recv($2)._yourself();
 return self["@stackListWidget"];
@@ -763,7 +747,6 @@ selector: "doIt:",
 protocol: 'actions',
 fn: function (aString){
 var self=this;
-function $ErrorHandler(){return $globals.ErrorHandler||(typeof ErrorHandler=="undefined"?nil:ErrorHandler)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -779,7 +762,7 @@ return $recv(self._debuggerModel())._evaluate_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-$recv($ErrorHandler())._handleError_(e);
+$recv($globals.ErrorHandler)._handleError_(e);
 return nil;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({e:e},$ctx1,2)});
@@ -1025,9 +1008,6 @@ selector: "observeBrowserModel",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLDebuggerContextSelected(){return $globals.HLDebuggerContextSelected||(typeof HLDebuggerContextSelected=="undefined"?nil:HLDebuggerContextSelected)}
-function $HLDebuggerStepped(){return $globals.HLDebuggerStepped||(typeof HLDebuggerStepped=="undefined"?nil:HLDebuggerStepped)}
-function $HLDebuggerWhere(){return $globals.HLDebuggerWhere||(typeof HLDebuggerWhere=="undefined"?nil:HLDebuggerWhere)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1048,7 +1028,7 @@ $1=$recv($2)._announcer();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["announcer"]=1;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLDebuggerContextSelected(),"onContextSelected",self);
+$recv($1)._on_send_to_($globals.HLDebuggerContextSelected,"onContextSelected",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=1;
 //>>excludeEnd("ctx");
@@ -1060,11 +1040,11 @@ $3=$recv($4)._announcer();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["announcer"]=2;
 //>>excludeEnd("ctx");
-$recv($3)._on_send_to_($HLDebuggerStepped(),"onContextSelected",self);
+$recv($3)._on_send_to_($globals.HLDebuggerStepped,"onContextSelected",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=2;
 //>>excludeEnd("ctx");
-$recv($recv(self._browserModel())._announcer())._on_send_to_($HLDebuggerWhere(),"onContextSelected",self);
+$recv($recv(self._browserModel())._announcer())._on_send_to_($globals.HLDebuggerWhere,"onContextSelected",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeBrowserModel",{},$globals.HLDebuggerCodeWidget)});
@@ -1171,11 +1151,10 @@ protocol: 'accessing',
 fn: function (){
 var self=this;
 var contexts,context;
-function $OrderedCollection(){return $globals.OrderedCollection||(typeof OrderedCollection=="undefined"?nil:OrderedCollection)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-contexts=$recv($OrderedCollection())._new();
+contexts=$recv($globals.OrderedCollection)._new();
 context=self._rootContext();
 $recv((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -1239,7 +1218,6 @@ selector: "currentContext:",
 protocol: 'accessing',
 fn: function (aContext){
 var self=this;
-function $HLDebuggerContextSelected(){return $globals.HLDebuggerContextSelected||(typeof HLDebuggerContextSelected=="undefined"?nil:HLDebuggerContextSelected)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1254,7 +1232,7 @@ $recv(self._debugger())._context_(aContext);
 $ctx2.sendIdx["context:"]=1;
 //>>excludeEnd("ctx");
 $1=self._announcer();
-$3=$recv($HLDebuggerContextSelected())._new();
+$3=$recv($globals.HLDebuggerContextSelected)._new();
 $recv($3)._context_(aContext);
 $2=$recv($3)._yourself();
 return $recv($1)._announce_($2);
@@ -1282,14 +1260,13 @@ selector: "debugger",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $ASTDebugger(){return $globals.ASTDebugger||(typeof ASTDebugger=="undefined"?nil:ASTDebugger)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@debugger"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@debugger"]=$recv($ASTDebugger())._new();
+self["@debugger"]=$recv($globals.ASTDebugger)._new();
 return self["@debugger"];
 } else {
 return $1;
@@ -1386,12 +1363,11 @@ protocol: 'initialization',
 fn: function (anError){
 var self=this;
 var errorContext;
-function $AIContext(){return $globals.AIContext||(typeof AIContext=="undefined"?nil:AIContext)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 self["@error"]=anError;
-errorContext=$recv($AIContext())._fromMethodContext_($recv(self["@error"])._context());
+errorContext=$recv($globals.AIContext)._fromMethodContext_($recv(self["@error"])._context());
 self["@rootContext"]=$recv(self["@error"])._signalerContextFrom_(errorContext);
 self._selectedMethod_($recv(self["@rootContext"])._method());
 return self;
@@ -1437,7 +1413,6 @@ selector: "onStep",
 protocol: 'reactions',
 fn: function (){
 var self=this;
-function $HLDebuggerContextSelected(){return $globals.HLDebuggerContextSelected||(typeof HLDebuggerContextSelected=="undefined"?nil:HLDebuggerContextSelected)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1453,7 +1428,7 @@ $ctx1.sendIdx["currentContext"]=2;
 $1=$recv($2)._method();
 self._selectedMethod_($1);
 $3=self._announcer();
-$5=$recv($HLDebuggerContextSelected())._new();
+$5=$recv($globals.HLDebuggerContextSelected)._new();
 $recv($5)._context_(self._currentContext());
 $4=$recv($5)._yourself();
 $recv($3)._announce_($4);
@@ -1477,12 +1452,11 @@ selector: "proceed",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLDebuggerProceeded(){return $globals.HLDebuggerProceeded||(typeof HLDebuggerProceeded=="undefined"?nil:HLDebuggerProceeded)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 $recv(self._debugger())._proceed();
-$recv(self._announcer())._announce_($recv($HLDebuggerProceeded())._new());
+$recv(self._announcer())._announce_($recv($globals.HLDebuggerProceeded)._new());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"proceed",{},$globals.HLDebuggerModel)});
@@ -1503,7 +1477,6 @@ selector: "restart",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLDebuggerStepped(){return $globals.HLDebuggerStepped||(typeof HLDebuggerStepped=="undefined"?nil:HLDebuggerStepped)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1511,7 +1484,7 @@ var $1,$3,$2;
 $recv(self._debugger())._restart();
 self._onStep();
 $1=self._announcer();
-$3=$recv($HLDebuggerStepped())._new();
+$3=$recv($globals.HLDebuggerStepped)._new();
 $recv($3)._context_(self._currentContext());
 $2=$recv($3)._yourself();
 $recv($1)._announce_($2);
@@ -1553,7 +1526,6 @@ selector: "stepOver",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLDebuggerStepped(){return $globals.HLDebuggerStepped||(typeof HLDebuggerStepped=="undefined"?nil:HLDebuggerStepped)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1561,7 +1533,7 @@ var $1,$3,$2;
 $recv(self._debugger())._stepOver();
 self._onStep();
 $1=self._announcer();
-$3=$recv($HLDebuggerStepped())._new();
+$3=$recv($globals.HLDebuggerStepped)._new();
 $recv($3)._context_(self._currentContext());
 $2=$recv($3)._yourself();
 $recv($1)._announce_($2);
@@ -1585,11 +1557,10 @@ selector: "where",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLDebuggerWhere(){return $globals.HLDebuggerWhere||(typeof HLDebuggerWhere=="undefined"?nil:HLDebuggerWhere)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv(self._announcer())._announce_($recv($HLDebuggerWhere())._new());
+$recv(self._announcer())._announce_($recv($globals.HLDebuggerWhere)._new());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"where",{},$globals.HLDebuggerModel)});
@@ -1639,12 +1610,11 @@ selector: "confirmDebugError:",
 protocol: 'error handling',
 fn: function (anError){
 var self=this;
-function $HLConfirmationWidget(){return $globals.HLConfirmationWidget||(typeof HLConfirmationWidget=="undefined"?nil:HLConfirmationWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-$1=$recv($HLConfirmationWidget())._new();
+$1=$recv($globals.HLConfirmationWidget)._new();
 $recv($1)._confirmationString_($recv(anError)._messageText());
 $recv($1)._actionBlock_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -1678,9 +1648,6 @@ selector: "debugError:",
 protocol: 'error handling',
 fn: function (anError){
 var self=this;
-function $HLDebugger(){return $globals.HLDebugger||(typeof HLDebugger=="undefined"?nil:HLDebugger)}
-function $Error(){return $globals.Error||(typeof Error=="undefined"?nil:Error)}
-function $ConsoleErrorHandler(){return $globals.ConsoleErrorHandler||(typeof ConsoleErrorHandler=="undefined"?nil:ConsoleErrorHandler)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1688,15 +1655,15 @@ $recv((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-return $recv($recv($HLDebugger())._on_(anError))._openAsTab();
+return $recv($recv($globals.HLDebugger)._on_(anError))._openAsTab();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
-}))._on_do_($Error(),(function(error){
+}))._on_do_($globals.Error,(function(error){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-return $recv($recv($ConsoleErrorHandler())._new())._handleError_(error);
+return $recv($recv($globals.ConsoleErrorHandler)._new())._handleError_(error);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({error:error},$ctx1,2)});
 //>>excludeEnd("ctx");
@@ -1745,12 +1712,11 @@ selector: "onErrorHandled",
 protocol: 'error handling',
 fn: function (){
 var self=this;
-function $HLProgressWidget(){return $globals.HLProgressWidget||(typeof HLProgressWidget=="undefined"?nil:HLProgressWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-$1=$recv($HLProgressWidget())._default();
+$1=$recv($globals.HLProgressWidget)._default();
 $recv($1)._flush();
 $recv($1)._remove();
 return self;
@@ -1817,7 +1783,6 @@ selector: "observeModel",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLDebuggerStepped(){return $globals.HLDebuggerStepped||(typeof HLDebuggerStepped=="undefined"?nil:HLDebuggerStepped)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1829,7 +1794,7 @@ $ctx1.supercall = true,
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
-$recv($recv(self._model())._announcer())._on_send_to_($HLDebuggerStepped(),"onDebuggerStepped:",self);
+$recv($recv(self._model())._announcer())._on_send_to_($globals.HLDebuggerStepped,"onDebuggerStepped:",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeModel",{},$globals.HLStackListWidget)});

+ 19 - 38
src/Helios-Helpers.js

@@ -281,12 +281,11 @@ selector: "buildPrefixDictionary",
 protocol: 'initialization',
 fn: function (){
 var self=this;
-function $Dictionary(){return $globals.Dictionary||(typeof Dictionary=="undefined"?nil:Dictionary)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-self["@prefixMapping"]=$recv($Dictionary())._new();
+self["@prefixMapping"]=$recv($globals.Dictionary)._new();
 $1=self["@prefixMapping"];
 $recv($1)._at_put_("test","tests");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -433,19 +432,17 @@ protocol: 'private',
 fn: function (){
 var self=this;
 var protocolBag,methods,protocolToUse,counter;
-function $Dictionary(){return $globals.Dictionary||(typeof Dictionary=="undefined"?nil:Dictionary)}
-function $HLReferencesModel(){return $globals.HLReferencesModel||(typeof HLReferencesModel=="undefined"?nil:HLReferencesModel)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $2,$1,$4,$3,$5;
 var $early={};
 try {
-protocolBag=$recv($Dictionary())._new();
+protocolBag=$recv($globals.Dictionary)._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=1;
 //>>excludeEnd("ctx");
-methods=$recv($recv($HLReferencesModel())._new())._implementorsOf_($recv(self["@method"])._selector());
+methods=$recv($recv($globals.HLReferencesModel)._new())._implementorsOf_($recv(self["@method"])._selector());
 $recv(methods)._ifEmpty_ifNotEmpty_((function(){
 throw $early=[false];
 
@@ -607,7 +604,6 @@ selector: "initialize",
 protocol: 'initialization',
 fn: function (){
 var self=this;
-function $OrderedCollection(){return $globals.OrderedCollection||(typeof OrderedCollection=="undefined"?nil:OrderedCollection)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -619,7 +615,7 @@ $ctx1.supercall = true,
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
-self["@sourceCodes"]=$recv($OrderedCollection())._new();
+self["@sourceCodes"]=$recv($globals.OrderedCollection)._new();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"initialize",{},$globals.HLGenerationOutput)});
@@ -873,15 +869,11 @@ selector: "setupClassifiers",
 protocol: 'initialization',
 fn: function (){
 var self=this;
-function $HLImplementorClassifier(){return $globals.HLImplementorClassifier||(typeof HLImplementorClassifier=="undefined"?nil:HLImplementorClassifier)}
-function $HLPrefixClassifier(){return $globals.HLPrefixClassifier||(typeof HLPrefixClassifier=="undefined"?nil:HLPrefixClassifier)}
-function $HLSuperclassClassifier(){return $globals.HLSuperclassClassifier||(typeof HLSuperclassClassifier=="undefined"?nil:HLSuperclassClassifier)}
-function $HLAccessorClassifier(){return $globals.HLAccessorClassifier||(typeof HLAccessorClassifier=="undefined"?nil:HLAccessorClassifier)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$2,$3;
-$1=$recv($HLImplementorClassifier())._new();
+$1=$recv($globals.HLImplementorClassifier)._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=1;
 //>>excludeEnd("ctx");
@@ -889,7 +881,7 @@ self._addClassifier_($1);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["addClassifier:"]=1;
 //>>excludeEnd("ctx");
-$2=$recv($HLPrefixClassifier())._new();
+$2=$recv($globals.HLPrefixClassifier)._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=2;
 //>>excludeEnd("ctx");
@@ -897,7 +889,7 @@ self._addClassifier_($2);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["addClassifier:"]=2;
 //>>excludeEnd("ctx");
-$3=$recv($HLSuperclassClassifier())._new();
+$3=$recv($globals.HLSuperclassClassifier)._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=3;
 //>>excludeEnd("ctx");
@@ -905,7 +897,7 @@ self._addClassifier_($3);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["addClassifier:"]=3;
 //>>excludeEnd("ctx");
-self._addClassifier_($recv($HLAccessorClassifier())._new());
+self._addClassifier_($recv($globals.HLAccessorClassifier)._new());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"setupClassifiers",{},$globals.HLMethodClassifier)});
@@ -986,7 +978,6 @@ selector: "initialize",
 protocol: 'initialization',
 fn: function (){
 var self=this;
-function $HLGenerationOutput(){return $globals.HLGenerationOutput||(typeof HLGenerationOutput=="undefined"?nil:HLGenerationOutput)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -998,7 +989,7 @@ $ctx1.supercall = true,
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
-self["@output"]=$recv($HLGenerationOutput())._new();
+self["@output"]=$recv($globals.HLGenerationOutput)._new();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"initialize",{},$globals.HLMethodGenerator)});
@@ -1068,12 +1059,11 @@ protocol: 'double-dispatch',
 fn: function (){
 var self=this;
 var sources;
-function $OrderedCollection(){return $globals.OrderedCollection||(typeof OrderedCollection=="undefined"?nil:OrderedCollection)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-sources=$recv($OrderedCollection())._new();
+sources=$recv($globals.OrderedCollection)._new();
 $recv($recv($recv($recv(self["@output"])._targetClass())._instanceVariableNames())._sorted())._do_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
@@ -1144,15 +1134,13 @@ selector: "getterFor:",
 protocol: 'private',
 fn: function (anInstanceVariable){
 var self=this;
-function $HLMethodSourceCode(){return $globals.HLMethodSourceCode||(typeof HLMethodSourceCode=="undefined"?nil:HLMethodSourceCode)}
-function $String(){return $globals.String||(typeof String=="undefined"?nil:String)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-$1=$recv($HLMethodSourceCode())._new();
+$1=$recv($globals.HLMethodSourceCode)._new();
 $recv($1)._selector_(anInstanceVariable);
-return $recv($1)._sourceCode_($recv($String())._streamContents_((function(stream){
+return $recv($1)._sourceCode_($recv($globals.String)._streamContents_((function(stream){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1188,15 +1176,13 @@ selector: "setterFor:",
 protocol: 'private',
 fn: function (anInstanceVariable){
 var self=this;
-function $HLMethodSourceCode(){return $globals.HLMethodSourceCode||(typeof HLMethodSourceCode=="undefined"?nil:HLMethodSourceCode)}
-function $String(){return $globals.String||(typeof String=="undefined"?nil:String)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$2;
-$1=$recv($HLMethodSourceCode())._new();
+$1=$recv($globals.HLMethodSourceCode)._new();
 $recv($1)._selector_($recv(anInstanceVariable).__comma(":"));
-return $recv($1)._sourceCode_($recv($String())._streamContents_((function(stream){
+return $recv($1)._sourceCode_($recv($globals.String)._streamContents_((function(stream){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1277,12 +1263,11 @@ selector: "generateInitializeCodeForObject",
 protocol: 'private',
 fn: function (){
 var self=this;
-function $String(){return $globals.String||(typeof String=="undefined"?nil:String)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $2,$1,$3,$4,$5,$6,$7;
-return $recv($String())._streamContents_((function(str){
+return $recv($globals.String)._streamContents_((function(str){
 var instVars,size;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
@@ -1394,12 +1379,11 @@ selector: "initializeMethodForObject",
 protocol: 'private',
 fn: function (){
 var self=this;
-function $HLMethodSourceCode(){return $globals.HLMethodSourceCode||(typeof HLMethodSourceCode=="undefined"?nil:HLMethodSourceCode)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-$1=$recv($HLMethodSourceCode())._new();
+$1=$recv($globals.HLMethodSourceCode)._new();
 $recv($1)._selector_("initialize");
 $recv($1)._sourceCode_(self._generateInitializeCodeForObject());
 return $recv($1)._yourself();
@@ -1529,11 +1513,10 @@ selector: "commitPackage",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLCommitPackageCommand(){return $globals.HLCommitPackageCommand||(typeof HLCommitPackageCommand=="undefined"?nil:HLCommitPackageCommand)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($recv($HLCommitPackageCommand())._for_(self._model()))._execute();
+$recv($recv($globals.HLCommitPackageCommand)._for_(self._model()))._execute();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"commitPackage",{},$globals.HLPackageCommitErrorHelper)});
@@ -1639,12 +1622,11 @@ selector: "showHelp",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLConfirmationWidget(){return $globals.HLConfirmationWidget||(typeof HLConfirmationWidget=="undefined"?nil:HLConfirmationWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$2;
-$1=$recv($HLConfirmationWidget())._new();
+$1=$recv($globals.HLConfirmationWidget)._new();
 $2=$recv("Commit failed for namespace \x22".__comma($recv($recv(self._package())._transport())._namespace())).__comma("\x22. Do you want to commit to another path?");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx[","]=1;
@@ -1682,12 +1664,11 @@ selector: "showNewCommitPath",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLRequestWidget(){return $globals.HLRequestWidget||(typeof HLRequestWidget=="undefined"?nil:HLRequestWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-$1=$recv($HLRequestWidget())._new();
+$1=$recv($globals.HLRequestWidget)._new();
 $recv($1)._beSingleline();
 $recv($1)._confirmationString_("Set commit path");
 $recv($1)._actionBlock_((function(url){

+ 20 - 41
src/Helios-Inspector.js

@@ -141,14 +141,13 @@ selector: "code",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLCodeModel(){return $globals.HLCodeModel||(typeof HLCodeModel=="undefined"?nil:HLCodeModel)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@code"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@code"]=$recv($HLCodeModel())._on_(self._environment());
+self["@code"]=$recv($globals.HLCodeModel)._on_(self._environment());
 return self["@code"];
 } else {
 return $1;
@@ -382,12 +381,11 @@ selector: "selection:",
 protocol: 'accessing',
 fn: function (anObject){
 var self=this;
-function $HLInstanceVariableSelected(){return $globals.HLInstanceVariableSelected||(typeof HLInstanceVariableSelected=="undefined"?nil:HLInstanceVariableSelected)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 self["@selection"]=anObject;
-$recv(self._announcer())._announce_($recv($HLInstanceVariableSelected())._on_(self["@selection"]));
+$recv(self._announcer())._announce_($recv($globals.HLInstanceVariableSelected)._on_(self["@selection"]));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selection:",{anObject:anObject},$globals.HLInspectorModel)});
@@ -432,14 +430,13 @@ selector: "variables",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $Dictionary(){return $globals.Dictionary||(typeof Dictionary=="undefined"?nil:Dictionary)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@variables"];
 if(($receiver = $1) == null || $receiver.isNil){
-return $recv($Dictionary())._new();
+return $recv($globals.Dictionary)._new();
 } else {
 return $1;
 };
@@ -510,14 +507,13 @@ selector: "announcer",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $Announcer(){return $globals.Announcer||(typeof Announcer=="undefined"?nil:Announcer)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@announcer"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@announcer"]=$recv($Announcer())._new();
+self["@announcer"]=$recv($globals.Announcer)._new();
 return self["@announcer"];
 } else {
 return $1;
@@ -564,11 +560,10 @@ selector: "dive",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLDiveRequested(){return $globals.HLDiveRequested||(typeof HLDiveRequested=="undefined"?nil:HLDiveRequested)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv(self._announcer())._announce_($recv($HLDiveRequested())._new());
+$recv(self._announcer())._announce_($recv($globals.HLDiveRequested)._new());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"dive",{},$globals.HLInspectorVariablesWidget)});
@@ -961,12 +956,11 @@ selector: "defaultCodeWidget",
 protocol: 'defaults',
 fn: function (){
 var self=this;
-function $HLCodeWidget(){return $globals.HLCodeWidget||(typeof HLCodeWidget=="undefined"?nil:HLCodeWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$3,$2;
-$1=$recv($HLCodeWidget())._new();
+$1=$recv($globals.HLCodeWidget)._new();
 $3=self._model();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["model"]=1;
@@ -994,14 +988,13 @@ selector: "displayWidget",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLInspectorDisplayWidget(){return $globals.HLInspectorDisplayWidget||(typeof HLInspectorDisplayWidget=="undefined"?nil:HLInspectorDisplayWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$2,$receiver;
 $1=self["@displayWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-$2=$recv($HLInspectorDisplayWidget())._new();
+$2=$recv($globals.HLInspectorDisplayWidget)._new();
 $recv($2)._inspector_(self);
 self["@displayWidget"]=$recv($2)._yourself();
 return self["@displayWidget"];
@@ -1156,14 +1149,13 @@ selector: "model",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLInspectorModel(){return $globals.HLInspectorModel||(typeof HLInspectorModel=="undefined"?nil:HLInspectorModel)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@model"];
 if(($receiver = $1) == null || $receiver.isNil){
-self._model_($recv($HLInspectorModel())._new());
+self._model_($recv($globals.HLInspectorModel)._new());
 return self["@model"];
 } else {
 return $1;
@@ -1215,11 +1207,10 @@ selector: "observeCodeWidget",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLDoItExecuted(){return $globals.HLDoItExecuted||(typeof HLDoItExecuted=="undefined"?nil:HLDoItExecuted)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($recv(self._codeWidget())._announcer())._on_do_($HLDoItExecuted(),(function(){
+$recv($recv(self._codeWidget())._announcer())._on_do_($globals.HLDoItExecuted,(function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1248,11 +1239,10 @@ selector: "observeModel",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLInstanceVariableSelected(){return $globals.HLInstanceVariableSelected||(typeof HLInstanceVariableSelected=="undefined"?nil:HLInstanceVariableSelected)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($recv(self._model())._announcer())._on_send_to_($HLInstanceVariableSelected(),"onInstanceVariableSelected",self);
+$recv($recv(self._model())._announcer())._on_send_to_($globals.HLInstanceVariableSelected,"onInstanceVariableSelected",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeModel",{},$globals.HLInspectorWidget)});
@@ -1273,11 +1263,10 @@ selector: "observeVariablesWidget",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLDiveRequested(){return $globals.HLDiveRequested||(typeof HLDiveRequested=="undefined"?nil:HLDiveRequested)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($recv(self._variablesWidget())._announcer())._on_send_to_($HLDiveRequested(),"onDive",self);
+$recv($recv(self._variablesWidget())._announcer())._on_send_to_($globals.HLDiveRequested,"onDive",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeVariablesWidget",{},$globals.HLInspectorWidget)});
@@ -1298,12 +1287,11 @@ selector: "onDive",
 protocol: 'reactions',
 fn: function (){
 var self=this;
-function $HLInspector(){return $globals.HLInspector||(typeof HLInspector=="undefined"?nil:HLInspector)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-$1=$recv($HLInspector())._new();
+$1=$recv($globals.HLInspector)._new();
 $recv($1)._inspect_($recv(self._model())._selectedInstVarObject());
 $recv($1)._openAsTab();
 return self;
@@ -1482,11 +1470,10 @@ selector: "register",
 protocol: 'registration',
 fn: function (){
 var self=this;
-function $HLInspector(){return $globals.HLInspector||(typeof HLInspector=="undefined"?nil:HLInspector)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($HLInspector())._register_(self);
+$recv($globals.HLInspector)._register_(self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"register",{},$globals.HLInspectorWidget)});
@@ -1507,13 +1494,11 @@ selector: "renderContentOn:",
 protocol: 'rendering',
 fn: function (html){
 var self=this;
-function $HLHorizontalSplitter(){return $globals.HLHorizontalSplitter||(typeof HLHorizontalSplitter=="undefined"?nil:HLHorizontalSplitter)}
-function $HLVerticalSplitter(){return $globals.HLVerticalSplitter||(typeof HLVerticalSplitter=="undefined"?nil:HLVerticalSplitter)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-$1=$recv($HLHorizontalSplitter())._with_with_($recv($HLVerticalSplitter())._with_with_(self._variablesWidget(),self._displayWidget()),self._codeWidget());
+$1=$recv($globals.HLHorizontalSplitter)._with_with_($recv($globals.HLVerticalSplitter)._with_with_(self._variablesWidget(),self._displayWidget()),self._codeWidget());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["with:with:"]=1;
 //>>excludeEnd("ctx");
@@ -1604,7 +1589,6 @@ selector: "unregister",
 protocol: 'registration',
 fn: function (){
 var self=this;
-function $HLInspector(){return $globals.HLInspector||(typeof HLInspector=="undefined"?nil:HLInspector)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1616,7 +1600,7 @@ $ctx1.supercall = true,
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
-$recv($HLInspector())._unregister_(self);
+$recv($globals.HLInspector)._unregister_(self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"unregister",{},$globals.HLInspectorWidget)});
@@ -1637,14 +1621,13 @@ selector: "variablesWidget",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLInspectorVariablesWidget(){return $globals.HLInspectorVariablesWidget||(typeof HLInspectorVariablesWidget=="undefined"?nil:HLInspectorVariablesWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$2,$receiver;
 $1=self["@variablesWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-$2=$recv($HLInspectorVariablesWidget())._new();
+$2=$recv($globals.HLInspectorVariablesWidget)._new();
 $recv($2)._inspector_(self);
 self["@variablesWidget"]=$recv($2)._yourself();
 return self["@variablesWidget"];
@@ -1705,9 +1688,6 @@ selector: "renderContentOn:",
 protocol: 'rendering',
 fn: function (html){
 var self=this;
-function $HLContainer(){return $globals.HLContainer||(typeof HLContainer=="undefined"?nil:HLContainer)}
-function $HLHorizontalSplitter(){return $globals.HLHorizontalSplitter||(typeof HLHorizontalSplitter=="undefined"?nil:HLHorizontalSplitter)}
-function $HLVerticalSplitter(){return $globals.HLVerticalSplitter||(typeof HLVerticalSplitter=="undefined"?nil:HLVerticalSplitter)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1716,12 +1696,12 @@ $4=self._variablesWidget();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["variablesWidget"]=1;
 //>>excludeEnd("ctx");
-$3=$recv($HLVerticalSplitter())._with_with_($4,self._displayWidget());
-$2=$recv($HLHorizontalSplitter())._with_with_($3,self._codeWidget());
+$3=$recv($globals.HLVerticalSplitter)._with_with_($4,self._displayWidget());
+$2=$recv($globals.HLHorizontalSplitter)._with_with_($3,self._codeWidget());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["with:with:"]=1;
 //>>excludeEnd("ctx");
-$1=$recv($HLContainer())._with_($2);
+$1=$recv($globals.HLContainer)._with_($2);
 $recv(html)._with_($1);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["with:"]=1;
@@ -1826,14 +1806,13 @@ selector: "inspectors",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $OrderedCollection(){return $globals.OrderedCollection||(typeof OrderedCollection=="undefined"?nil:OrderedCollection)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@inspectors"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@inspectors"]=$recv($OrderedCollection())._new();
+self["@inspectors"]=$recv($globals.OrderedCollection)._new();
 return self["@inspectors"];
 } else {
 return $1;

+ 15 - 30
src/Helios-KeyBindings.js

@@ -206,11 +206,10 @@ selector: "shortcut",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $String(){return $globals.String||(typeof String=="undefined"?nil:String)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($String())._fromCharCode_(self._key());
+return $recv($globals.String)._fromCharCode_(self._key());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"shortcut",{},$globals.HLBinding)});
 //>>excludeEnd("ctx");
@@ -263,14 +262,13 @@ selector: "apply",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLKeyBinder(){return $globals.HLKeyBinder||(typeof HLKeyBinder=="undefined"?nil:HLKeyBinder)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
 $1=$recv(self._command())._isInputRequired();
 if($core.assert($1)){
-$recv($recv($recv($HLKeyBinder())._current())._helper())._showWidget_(self._inputWidget());
+$recv($recv($recv($globals.HLKeyBinder)._current())._helper())._showWidget_(self._inputWidget());
 } else {
 self._executeCommand();
 };
@@ -331,12 +329,11 @@ selector: "executeCommand",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLKeyBinder(){return $globals.HLKeyBinder||(typeof HLKeyBinder=="undefined"?nil:HLKeyBinder)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 $recv(self._command())._execute();
-$recv($recv($HLKeyBinder())._current())._deactivate();
+$recv($recv($globals.HLKeyBinder)._current())._deactivate();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"executeCommand",{},$globals.HLBindingAction)});
@@ -381,12 +378,11 @@ selector: "inputBinding",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLBindingInput(){return $globals.HLBindingInput||(typeof HLBindingInput=="undefined"?nil:HLBindingInput)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$3,$2,$5,$4,$7,$6,$9,$8,$10;
-$1=$recv($HLBindingInput())._new();
+$1=$recv($globals.HLBindingInput)._new();
 $3=self._command();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["command"]=1;
@@ -442,12 +438,11 @@ selector: "inputWidget",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLBindingActionInputWidget(){return $globals.HLBindingActionInputWidget||(typeof HLBindingActionInputWidget=="undefined"?nil:HLBindingActionInputWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$3,$2,$5,$4;
-$1=$recv($HLBindingActionInputWidget())._new();
+$1=$recv($globals.HLBindingActionInputWidget)._new();
 $3=self._command();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["command"]=1;
@@ -574,12 +569,11 @@ selector: "addActionKey:labelled:callback:",
 protocol: 'adding',
 fn: function (anInteger,aString,aBlock){
 var self=this;
-function $HLBindingAction(){return $globals.HLBindingAction||(typeof HLBindingAction=="undefined"?nil:HLBindingAction)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $2,$1;
-$2=$recv($HLBindingAction())._on_labelled_(anInteger,aString);
+$2=$recv($globals.HLBindingAction)._on_labelled_(anInteger,aString);
 $recv($2)._callback_(aBlock);
 $1=$recv($2)._yourself();
 self._add_($1);
@@ -603,11 +597,10 @@ selector: "addGroupKey:labelled:",
 protocol: 'add',
 fn: function (anInteger,aString){
 var self=this;
-function $HLBindingGroup(){return $globals.HLBindingGroup||(typeof HLBindingGroup=="undefined"?nil:HLBindingGroup)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-self._add_($recv($HLBindingGroup())._on_labelled_(anInteger,aString));
+self._add_($recv($globals.HLBindingGroup)._on_labelled_(anInteger,aString));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"addGroupKey:labelled:",{anInteger:anInteger,aString:aString},$globals.HLBindingGroup)});
@@ -729,14 +722,13 @@ selector: "bindings",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $OrderedCollection(){return $globals.OrderedCollection||(typeof OrderedCollection=="undefined"?nil:OrderedCollection)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@bindings"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@bindings"]=$recv($OrderedCollection())._new();
+self["@bindings"]=$recv($globals.OrderedCollection)._new();
 return self["@bindings"];
 } else {
 return $1;
@@ -1031,7 +1023,6 @@ selector: "evaluate:",
 protocol: 'actions',
 fn: function (aString){
 var self=this;
-function $Error(){return $globals.Error||(typeof Error=="undefined"?nil:Error)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1043,7 +1034,7 @@ return $recv(self._callback())._value_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
-}))._on_do_($Error(),(function(ex){
+}))._on_do_($globals.Error,(function(ex){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1593,19 +1584,15 @@ protocol: 'defaults',
 fn: function (){
 var self=this;
 var group;
-function $HLBindingGroup(){return $globals.HLBindingGroup||(typeof HLBindingGroup=="undefined"?nil:HLBindingGroup)}
-function $HLCloseTabCommand(){return $globals.HLCloseTabCommand||(typeof HLCloseTabCommand=="undefined"?nil:HLCloseTabCommand)}
-function $HLSwitchTabCommand(){return $globals.HLSwitchTabCommand||(typeof HLSwitchTabCommand=="undefined"?nil:HLSwitchTabCommand)}
-function $HLOpenCommand(){return $globals.HLOpenCommand||(typeof HLOpenCommand=="undefined"?nil:HLOpenCommand)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$3,$2;
-$1=$recv($HLBindingGroup())._new();
+$1=$recv($globals.HLBindingGroup)._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=1;
 //>>excludeEnd("ctx");
-$3=$recv($HLCloseTabCommand())._new();
+$3=$recv($globals.HLCloseTabCommand)._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=2;
 //>>excludeEnd("ctx");
@@ -1617,9 +1604,9 @@ $recv($1)._add_($2);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["add:"]=1;
 //>>excludeEnd("ctx");
-$recv($1)._add_($recv($recv($HLSwitchTabCommand())._new())._asBinding());
+$recv($1)._add_($recv($recv($globals.HLSwitchTabCommand)._new())._asBinding());
 group=$recv($1)._yourself();
-$recv($HLOpenCommand())._registerConcreteClassesOn_(group);
+$recv($globals.HLOpenCommand)._registerConcreteClassesOn_(group);
 return group;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"defaultBindings",{group:group},$globals.HLKeyBinder)});
@@ -1887,7 +1874,6 @@ selector: "initialize",
 protocol: 'initialization',
 fn: function (){
 var self=this;
-function $HLKeyBinderHelperWidget(){return $globals.HLKeyBinderHelperWidget||(typeof HLKeyBinderHelperWidget=="undefined"?nil:HLKeyBinderHelperWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1899,7 +1885,7 @@ $ctx1.supercall = true,
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
-self["@helper"]=$recv($HLKeyBinderHelperWidget())._on_(self);
+self["@helper"]=$recv($globals.HLKeyBinderHelperWidget)._on_(self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"initialize",{},$globals.HLKeyBinder)});
@@ -2922,14 +2908,13 @@ selector: "keyBindings",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $Dictionary(){return $globals.Dictionary||(typeof Dictionary=="undefined"?nil:Dictionary)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@keyBindings"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@keyBindings"]=$recv($Dictionary())._new();
+self["@keyBindings"]=$recv($globals.Dictionary)._new();
 return self["@keyBindings"];
 } else {
 return $1;

+ 19 - 37
src/Helios-References.js

@@ -185,14 +185,13 @@ selector: "classReferencesListWidget",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLClassReferencesListWidget(){return $globals.HLClassReferencesListWidget||(typeof HLClassReferencesListWidget=="undefined"?nil:HLClassReferencesListWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@classReferencesListWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@classReferencesListWidget"]=$recv($HLClassReferencesListWidget())._on_(self._model());
+self["@classReferencesListWidget"]=$recv($globals.HLClassReferencesListWidget)._on_(self._model());
 self["@classReferencesListWidget"];
 return $recv(self["@classReferencesListWidget"])._next_(self._regexpListWidget());
 } else {
@@ -217,14 +216,13 @@ selector: "implementorsListWidget",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLImplementorsListWidget(){return $globals.HLImplementorsListWidget||(typeof HLImplementorsListWidget=="undefined"?nil:HLImplementorsListWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@implementorsListWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@implementorsListWidget"]=$recv($HLImplementorsListWidget())._on_(self._model());
+self["@implementorsListWidget"]=$recv($globals.HLImplementorsListWidget)._on_(self._model());
 self["@implementorsListWidget"];
 return $recv(self["@implementorsListWidget"])._next_(self._classReferencesListWidget());
 } else {
@@ -249,14 +247,13 @@ selector: "model",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLReferencesModel(){return $globals.HLReferencesModel||(typeof HLReferencesModel=="undefined"?nil:HLReferencesModel)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$2,$receiver;
 $1=self["@model"];
 if(($receiver = $1) == null || $receiver.isNil){
-$2=$recv($HLReferencesModel())._new();
+$2=$recv($globals.HLReferencesModel)._new();
 $recv($2)._environment_($recv(self._manager())._environment());
 self["@model"]=$recv($2)._yourself();
 return self["@model"];
@@ -301,14 +298,13 @@ selector: "regexpListWidget",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLRegexpListWidget(){return $globals.HLRegexpListWidget||(typeof HLRegexpListWidget=="undefined"?nil:HLRegexpListWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@regexpListWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@regexpListWidget"]=$recv($HLRegexpListWidget())._on_(self._model());
+self["@regexpListWidget"]=$recv($globals.HLRegexpListWidget)._on_(self._model());
 self["@regexpListWidget"];
 return $recv(self["@regexpListWidget"])._next_(self._sourceCodeWidget());
 } else {
@@ -333,11 +329,10 @@ selector: "registerBindingsOn:",
 protocol: 'actions',
 fn: function (aBindingGroup){
 var self=this;
-function $HLToolCommand(){return $globals.HLToolCommand||(typeof HLToolCommand=="undefined"?nil:HLToolCommand)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($HLToolCommand())._registerConcreteClassesOn_for_(aBindingGroup,self._model());
+$recv($globals.HLToolCommand)._registerConcreteClassesOn_for_(aBindingGroup,self._model());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"registerBindingsOn:",{aBindingGroup:aBindingGroup},$globals.HLReferences)});
@@ -358,9 +353,6 @@ selector: "renderContentOn:",
 protocol: 'rendering',
 fn: function (html){
 var self=this;
-function $HLContainer(){return $globals.HLContainer||(typeof HLContainer=="undefined"?nil:HLContainer)}
-function $HLHorizontalSplitter(){return $globals.HLHorizontalSplitter||(typeof HLHorizontalSplitter=="undefined"?nil:HLHorizontalSplitter)}
-function $HLVerticalSplitter(){return $globals.HLVerticalSplitter||(typeof HLVerticalSplitter=="undefined"?nil:HLVerticalSplitter)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -369,19 +361,19 @@ $5=self._sendersListWidget();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["sendersListWidget"]=1;
 //>>excludeEnd("ctx");
-$4=$recv($HLVerticalSplitter())._with_with_($5,self._implementorsListWidget());
+$4=$recv($globals.HLVerticalSplitter)._with_with_($5,self._implementorsListWidget());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["with:with:"]=3;
 //>>excludeEnd("ctx");
-$3=$recv($HLVerticalSplitter())._with_with_($4,$recv($HLVerticalSplitter())._with_with_(self._classReferencesListWidget(),self._regexpListWidget()));
+$3=$recv($globals.HLVerticalSplitter)._with_with_($4,$recv($globals.HLVerticalSplitter)._with_with_(self._classReferencesListWidget(),self._regexpListWidget()));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["with:with:"]=2;
 //>>excludeEnd("ctx");
-$2=$recv($HLHorizontalSplitter())._with_with_($3,self._sourceCodeWidget());
+$2=$recv($globals.HLHorizontalSplitter)._with_with_($3,self._sourceCodeWidget());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["with:with:"]=1;
 //>>excludeEnd("ctx");
-$1=$recv($HLContainer())._with_($2);
+$1=$recv($globals.HLContainer)._with_($2);
 $recv(html)._with_($1);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["with:"]=1;
@@ -432,14 +424,13 @@ selector: "sendersListWidget",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLSendersListWidget(){return $globals.HLSendersListWidget||(typeof HLSendersListWidget=="undefined"?nil:HLSendersListWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@sendersListWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@sendersListWidget"]=$recv($HLSendersListWidget())._on_(self._model());
+self["@sendersListWidget"]=$recv($globals.HLSendersListWidget)._on_(self._model());
 self["@sendersListWidget"];
 return $recv(self["@sendersListWidget"])._next_(self._implementorsListWidget());
 } else {
@@ -464,14 +455,13 @@ selector: "sourceCodeWidget",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLBrowserCodeWidget(){return $globals.HLBrowserCodeWidget||(typeof HLBrowserCodeWidget=="undefined"?nil:HLBrowserCodeWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$2,$receiver;
 $1=self["@sourceCodeWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-$2=$recv($HLBrowserCodeWidget())._new();
+$2=$recv($globals.HLBrowserCodeWidget)._new();
 $recv($2)._browserModel_(self._model());
 self["@sourceCodeWidget"]=$recv($2)._yourself();
 return self["@sourceCodeWidget"];
@@ -647,14 +637,12 @@ selector: "observeModel",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLSearchReferences(){return $globals.HLSearchReferences||(typeof HLSearchReferences=="undefined"?nil:HLSearchReferences)}
-function $HLMethodSelected(){return $globals.HLMethodSelected||(typeof HLMethodSelected=="undefined"?nil:HLMethodSelected)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
 $1=$recv(self._model())._announcer();
-$recv($1)._on_do_($HLSearchReferences(),(function(ann){
+$recv($1)._on_do_($globals.HLSearchReferences,(function(ann){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -666,7 +654,7 @@ return self._onSearchReferences_($recv(ann)._searchString());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:do:"]=1;
 //>>excludeEnd("ctx");
-$recv($1)._on_do_($HLMethodSelected(),(function(ann){
+$recv($1)._on_do_($globals.HLMethodSelected,(function(ann){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1216,11 +1204,10 @@ selector: "methodReferenceOn:",
 protocol: 'accessing',
 fn: function (aCompiledMethod){
 var self=this;
-function $HLMethodReference(){return $globals.HLMethodReference||(typeof HLMethodReference=="undefined"?nil:HLMethodReference)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($HLMethodReference())._on_(aCompiledMethod);
+return $recv($globals.HLMethodReference)._on_(aCompiledMethod);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"methodReferenceOn:",{aCompiledMethod:aCompiledMethod},$globals.HLReferencesModel)});
 //>>excludeEnd("ctx");
@@ -1271,7 +1258,6 @@ protocol: 'actions',
 fn: function (aString){
 var self=this;
 var browser;
-function $HLBrowser(){return $globals.HLBrowser||(typeof HLBrowser=="undefined"?nil:HLBrowser)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1279,7 +1265,7 @@ self._withChangesDo_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-browser=$recv($HLBrowser())._openAsTab();
+browser=$recv($globals.HLBrowser)._openAsTab();
 browser;
 return $recv(browser)._openClassNamed_(aString);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -1307,7 +1293,6 @@ protocol: 'actions',
 fn: function (){
 var self=this;
 var browser;
-function $HLBrowser(){return $globals.HLBrowser||(typeof HLBrowser=="undefined"?nil:HLBrowser)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1325,7 +1310,7 @@ self._withChangesDo_((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-browser=$recv($HLBrowser())._openAsTab();
+browser=$recv($globals.HLBrowser)._openAsTab();
 browser;
 return $recv(browser)._openMethod_(self._selectedMethod());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -1391,14 +1376,13 @@ selector: "search:",
 protocol: 'actions',
 fn: function (aString){
 var self=this;
-function $HLSearchReferences(){return $globals.HLSearchReferences||(typeof HLSearchReferences=="undefined"?nil:HLSearchReferences)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$3,$2;
 self._updateCaches();
 $1=self._announcer();
-$3=$recv($HLSearchReferences())._new();
+$3=$recv($globals.HLSearchReferences)._new();
 $recv($3)._searchString_(aString);
 $2=$recv($3)._yourself();
 $recv($1)._announce_($2);
@@ -1486,12 +1470,11 @@ selector: "updateClassesAndMetaclassesCache",
 protocol: 'cache',
 fn: function (){
 var self=this;
-function $OrderedCollection(){return $globals.OrderedCollection||(typeof OrderedCollection=="undefined"?nil:OrderedCollection)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-self["@classesAndMetaclassesCache"]=$recv($OrderedCollection())._new();
+self["@classesAndMetaclassesCache"]=$recv($globals.OrderedCollection)._new();
 $recv($recv(self._environment())._classes())._do_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
@@ -1526,11 +1509,10 @@ selector: "updateMethodsCache",
 protocol: 'cache',
 fn: function (){
 var self=this;
-function $OrderedCollection(){return $globals.OrderedCollection||(typeof OrderedCollection=="undefined"?nil:OrderedCollection)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-self["@methodsCache"]=$recv($OrderedCollection())._new();
+self["@methodsCache"]=$recv($globals.OrderedCollection)._new();
 $recv(self._classesAndMetaclasses())._do_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {

+ 8 - 16
src/Helios-SUnit-Tests.js

@@ -14,7 +14,6 @@ selector: "setUp",
 protocol: 'initializing',
 fn: function (){
 var self=this;
-function $HLSUnitModel(){return $globals.HLSUnitModel||(typeof HLSUnitModel=="undefined"?nil:HLSUnitModel)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -26,7 +25,7 @@ $ctx1.supercall = true,
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
-self["@model"]=$recv($HLSUnitModel())._new();
+self["@model"]=$recv($globals.HLSUnitModel)._new();
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"setUp",{},$globals.HLSUnitModelTest)});
@@ -82,11 +81,10 @@ selector: "testEmptyTestResults",
 protocol: 'tests',
 fn: function (){
 var self=this;
-function $TestResult(){return $globals.TestResult||(typeof TestResult=="undefined"?nil:TestResult)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-self._assert_($recv($recv(self["@model"])._testResult())._isKindOf_($TestResult()));
+self._assert_($recv($recv(self["@model"])._testResult())._isKindOf_($globals.TestResult));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"testEmptyTestResults",{},$globals.HLSUnitModelTest)});
@@ -312,7 +310,6 @@ protocol: 'tests',
 fn: function (){
 var self=this;
 var announcementFired;
-function $HLClassSelected(){return $globals.HLClassSelected||(typeof HLClassSelected=="undefined"?nil:HLClassSelected)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -327,7 +324,7 @@ self._assert_($1);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["assert:"]=1;
 //>>excludeEnd("ctx");
-$recv($recv(self["@model"])._announcer())._on_do_for_($HLClassSelected(),(function(){
+$recv($recv(self["@model"])._announcer())._on_do_for_($globals.HLClassSelected,(function(){
 announcementFired=true;
 return announcementFired;
 
@@ -361,7 +358,6 @@ protocol: 'tests',
 fn: function (){
 var self=this;
 var announcementFired;
-function $HLPackageSelected(){return $globals.HLPackageSelected||(typeof HLPackageSelected=="undefined"?nil:HLPackageSelected)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -375,7 +371,7 @@ self._assert_($1);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["assert:"]=1;
 //>>excludeEnd("ctx");
-$recv($recv(self["@model"])._announcer())._on_do_for_($HLPackageSelected(),(function(){
+$recv($recv(self["@model"])._announcer())._on_do_for_($globals.HLPackageSelected,(function(){
 announcementFired=true;
 return announcementFired;
 
@@ -453,15 +449,13 @@ protocol: 'tests',
 fn: function (){
 var self=this;
 var notATestClass;
-function $Object(){return $globals.Object||(typeof Object=="undefined"?nil:Object)}
-function $Smalltalk(){return $globals.Smalltalk||(typeof Smalltalk=="undefined"?nil:Smalltalk)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-notATestClass=$recv($Object())._subclass_instanceVariableNames_package_("HLNotATestClass","",$recv(self._class())._category());
+notATestClass=$recv($globals.Object)._subclass_instanceVariableNames_package_("HLNotATestClass","",$recv(self._class())._category());
 $recv(self["@model"])._selectPackage_(self._thisPackage());
 self._deny_($recv($recv(self["@model"])._testClasses())._includes_(notATestClass));
-$recv($Smalltalk())._removeClass_(notATestClass);
+$recv($globals.Smalltalk)._removeClass_(notATestClass);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"testTestClassHasOnlyTestClasses",{notATestClass:notATestClass},$globals.HLSUnitModelTest)});
@@ -525,7 +519,6 @@ protocol: 'tests',
 fn: function (){
 var self=this;
 var announcementFired;
-function $HLClassUnselected(){return $globals.HLClassUnselected||(typeof HLClassUnselected=="undefined"?nil:HLClassUnselected)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -537,7 +530,7 @@ $2=self._class();
 $ctx1.sendIdx["class"]=1;
 //>>excludeEnd("ctx");
 $recv($1)._selectClass_($2);
-$recv($recv(self["@model"])._announcer())._on_do_for_($HLClassUnselected(),(function(){
+$recv($recv(self["@model"])._announcer())._on_do_for_($globals.HLClassUnselected,(function(){
 announcementFired=true;
 return announcementFired;
 
@@ -569,7 +562,6 @@ protocol: 'tests',
 fn: function (){
 var self=this;
 var announcementFired;
-function $HLPackageUnselected(){return $globals.HLPackageUnselected||(typeof HLPackageUnselected=="undefined"?nil:HLPackageUnselected)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -580,7 +572,7 @@ $2=self._thisPackage();
 $ctx1.sendIdx["thisPackage"]=1;
 //>>excludeEnd("ctx");
 $recv($1)._selectPackage_($2);
-$recv($recv(self["@model"])._announcer())._on_do_for_($HLPackageUnselected(),(function(){
+$recv($recv(self["@model"])._announcer())._on_do_for_($globals.HLPackageUnselected,(function(){
 announcementFired=true;
 return announcementFired;
 

+ 37 - 73
src/Helios-SUnit.js

@@ -405,28 +405,24 @@ selector: "observeModel",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLPackageSelected(){return $globals.HLPackageSelected||(typeof HLPackageSelected=="undefined"?nil:HLPackageSelected)}
-function $HLPackageUnselected(){return $globals.HLPackageUnselected||(typeof HLPackageUnselected=="undefined"?nil:HLPackageUnselected)}
-function $HLClassSelected(){return $globals.HLClassSelected||(typeof HLClassSelected=="undefined"?nil:HLClassSelected)}
-function $HLClassUnselected(){return $globals.HLClassUnselected||(typeof HLClassUnselected=="undefined"?nil:HLClassUnselected)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
 $1=$recv(self._model())._announcer();
-$recv($1)._on_send_to_($HLPackageSelected(),"onPackageSelected:",self);
+$recv($1)._on_send_to_($globals.HLPackageSelected,"onPackageSelected:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=1;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLPackageUnselected(),"onPackageUnselected:",self);
+$recv($1)._on_send_to_($globals.HLPackageUnselected,"onPackageUnselected:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=2;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLClassSelected(),"onClassSelected:",self);
+$recv($1)._on_send_to_($globals.HLClassSelected,"onClassSelected:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=3;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLClassUnselected(),"onClassUnselected:",self);
+$recv($1)._on_send_to_($globals.HLClassUnselected,"onClassUnselected:",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeModel",{},$globals.HLSUnitClassesListWidget)});
@@ -447,11 +443,10 @@ selector: "observeSystem",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $ClassAdded(){return $globals.ClassAdded||(typeof ClassAdded=="undefined"?nil:ClassAdded)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($recv(self._model())._systemAnnouncer())._on_send_to_($ClassAdded(),"onClassAdded:",self);
+$recv($recv(self._model())._systemAnnouncer())._on_send_to_($globals.ClassAdded,"onClassAdded:",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeSystem",{},$globals.HLSUnitClassesListWidget)});
@@ -872,18 +867,16 @@ selector: "observeModel",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLPackageSelected(){return $globals.HLPackageSelected||(typeof HLPackageSelected=="undefined"?nil:HLPackageSelected)}
-function $HLPackageUnselected(){return $globals.HLPackageUnselected||(typeof HLPackageUnselected=="undefined"?nil:HLPackageUnselected)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
 $1=$recv(self._model())._announcer();
-$recv($1)._on_send_to_($HLPackageSelected(),"onPackageSelected:",self);
+$recv($1)._on_send_to_($globals.HLPackageSelected,"onPackageSelected:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=1;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLPackageUnselected(),"onPackageUnselected:",self);
+$recv($1)._on_send_to_($globals.HLPackageUnselected,"onPackageUnselected:",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeModel",{},$globals.HLSUnitPackagesListWidget)});
@@ -904,11 +897,10 @@ selector: "observeSystem",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $ClassAdded(){return $globals.ClassAdded||(typeof ClassAdded=="undefined"?nil:ClassAdded)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($recv(self._model())._systemAnnouncer())._on_send_to_($ClassAdded(),"onClassAdded:",self);
+$recv($recv(self._model())._systemAnnouncer())._on_send_to_($globals.ClassAdded,"onClassAdded:",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeSystem",{},$globals.HLSUnitPackagesListWidget)});
@@ -1171,14 +1163,13 @@ selector: "classesListWidget",
 protocol: 'widgets',
 fn: function (){
 var self=this;
-function $HLSUnitClassesListWidget(){return $globals.HLSUnitClassesListWidget||(typeof HLSUnitClassesListWidget=="undefined"?nil:HLSUnitClassesListWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@classesListWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@classesListWidget"]=$recv($HLSUnitClassesListWidget())._on_(self._model());
+self["@classesListWidget"]=$recv($globals.HLSUnitClassesListWidget)._on_(self._model());
 self["@classesListWidget"];
 return $recv(self["@classesListWidget"])._next_(self._failuresWidget());
 } else {
@@ -1203,14 +1194,13 @@ selector: "errorsWidget",
 protocol: 'widgets',
 fn: function (){
 var self=this;
-function $HLSUnitErrorsListWidget(){return $globals.HLSUnitErrorsListWidget||(typeof HLSUnitErrorsListWidget=="undefined"?nil:HLSUnitErrorsListWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@errorsWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@errorsWidget"]=$recv($HLSUnitErrorsListWidget())._on_(self._model());
+self["@errorsWidget"]=$recv($globals.HLSUnitErrorsListWidget)._on_(self._model());
 return self["@errorsWidget"];
 } else {
 return $1;
@@ -1234,14 +1224,13 @@ selector: "failuresWidget",
 protocol: 'widgets',
 fn: function (){
 var self=this;
-function $HLSUnitFailuresListWidget(){return $globals.HLSUnitFailuresListWidget||(typeof HLSUnitFailuresListWidget=="undefined"?nil:HLSUnitFailuresListWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@failuresWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@failuresWidget"]=$recv($HLSUnitFailuresListWidget())._on_(self._model());
+self["@failuresWidget"]=$recv($globals.HLSUnitFailuresListWidget)._on_(self._model());
 self["@failuresWidget"];
 return $recv(self["@failuresWidget"])._next_(self._errorsWidget());
 } else {
@@ -1266,14 +1255,13 @@ selector: "model",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLSUnitModel(){return $globals.HLSUnitModel||(typeof HLSUnitModel=="undefined"?nil:HLSUnitModel)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@model"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@model"]=$recv($HLSUnitModel())._new();
+self["@model"]=$recv($globals.HLSUnitModel)._new();
 return self["@model"];
 } else {
 return $1;
@@ -1297,14 +1285,13 @@ selector: "packagesListWidget",
 protocol: 'widgets',
 fn: function (){
 var self=this;
-function $HLSUnitPackagesListWidget(){return $globals.HLSUnitPackagesListWidget||(typeof HLSUnitPackagesListWidget=="undefined"?nil:HLSUnitPackagesListWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@packagesListWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@packagesListWidget"]=$recv($HLSUnitPackagesListWidget())._on_(self._model());
+self["@packagesListWidget"]=$recv($globals.HLSUnitPackagesListWidget)._on_(self._model());
 self["@packagesListWidget"];
 return $recv(self["@packagesListWidget"])._next_(self._classesListWidget());
 } else {
@@ -1329,11 +1316,10 @@ selector: "registerBindingsOn:",
 protocol: 'keybindings',
 fn: function (aBindingGroup){
 var self=this;
-function $HLToolCommand(){return $globals.HLToolCommand||(typeof HLToolCommand=="undefined"?nil:HLToolCommand)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($HLToolCommand())._registerConcreteClassesOn_for_(aBindingGroup,self._model());
+$recv($globals.HLToolCommand)._registerConcreteClassesOn_for_(aBindingGroup,self._model());
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"registerBindingsOn:",{aBindingGroup:aBindingGroup},$globals.HLSUnit)});
@@ -1355,8 +1341,6 @@ protocol: 'rendering',
 fn: function (html){
 var self=this;
 var resultSection;
-function $HLContainer(){return $globals.HLContainer||(typeof HLContainer=="undefined"?nil:HLContainer)}
-function $HLVerticalSplitter(){return $globals.HLVerticalSplitter||(typeof HLVerticalSplitter=="undefined"?nil:HLVerticalSplitter)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1365,14 +1349,14 @@ $4=self._packagesListWidget();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["packagesListWidget"]=1;
 //>>excludeEnd("ctx");
-$3=$recv($HLVerticalSplitter())._with_with_($4,self._classesListWidget());
+$3=$recv($globals.HLVerticalSplitter)._with_with_($4,self._classesListWidget());
 resultSection=self._resultSection();
 $5=resultSection;
-$2=$recv($HLVerticalSplitter())._with_with_($3,$5);
+$2=$recv($globals.HLVerticalSplitter)._with_with_($3,$5);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["with:with:"]=1;
 //>>excludeEnd("ctx");
-$1=$recv($HLContainer())._with_($2);
+$1=$recv($globals.HLContainer)._with_($2);
 $recv(html)._with_($1);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["with:"]=1;
@@ -1407,12 +1391,11 @@ selector: "resultSection",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLHorizontalSplitter(){return $globals.HLHorizontalSplitter||(typeof HLHorizontalSplitter=="undefined"?nil:HLHorizontalSplitter)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-$1=$recv($HLHorizontalSplitter())._with_with_(self._resultWidget(),$recv($HLHorizontalSplitter())._with_with_(self._failuresWidget(),self._errorsWidget()));
+$1=$recv($globals.HLHorizontalSplitter)._with_with_(self._resultWidget(),$recv($globals.HLHorizontalSplitter)._with_with_(self._failuresWidget(),self._errorsWidget()));
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["with:with:"]=1;
 //>>excludeEnd("ctx");
@@ -1436,14 +1419,13 @@ selector: "resultWidget",
 protocol: 'widgets',
 fn: function (){
 var self=this;
-function $HLSUnitResults(){return $globals.HLSUnitResults||(typeof HLSUnitResults=="undefined"?nil:HLSUnitResults)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$2,$receiver;
 $1=self["@resultWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-$2=$recv($HLSUnitResults())._new();
+$2=$recv($globals.HLSUnitResults)._new();
 $recv($2)._model_(self._model());
 self["@resultWidget"]=$recv($2)._yourself();
 return self["@resultWidget"];
@@ -1709,17 +1691,15 @@ protocol: 'actions',
 fn: function (){
 var self=this;
 var worker;
-function $TestSuiteRunner(){return $globals.TestSuiteRunner||(typeof TestSuiteRunner=="undefined"?nil:TestSuiteRunner)}
-function $HLRunTests(){return $globals.HLRunTests||(typeof HLRunTests=="undefined"?nil:HLRunTests)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-worker=$recv($TestSuiteRunner())._on_(self._testCases());
+worker=$recv($globals.TestSuiteRunner)._on_(self._testCases());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:"]=1;
 //>>excludeEnd("ctx");
 self["@testResult"]=$recv(worker)._result();
-$recv(self._announcer())._announce_($recv($HLRunTests())._on_(worker));
+$recv(self._announcer())._announce_($recv($globals.HLRunTests)._on_(worker));
 self._subscribeToTestSuite_(worker);
 $recv(worker)._run();
 return self;
@@ -1806,12 +1786,11 @@ selector: "selectClass:",
 protocol: 'actions',
 fn: function (aClass){
 var self=this;
-function $HLClassSelected(){return $globals.HLClassSelected||(typeof HLClassSelected=="undefined"?nil:HLClassSelected)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 $recv(self._unfilteredSelectedClasses())._add_(aClass);
-$recv(self._announcer())._announce_($recv($HLClassSelected())._on_(aClass));
+$recv(self._announcer())._announce_($recv($globals.HLClassSelected)._on_(aClass));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selectClass:",{aClass:aClass},$globals.HLSUnitModel)});
@@ -1832,12 +1811,11 @@ selector: "selectPackage:",
 protocol: 'actions',
 fn: function (aPackage){
 var self=this;
-function $HLPackageSelected(){return $globals.HLPackageSelected||(typeof HLPackageSelected=="undefined"?nil:HLPackageSelected)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 $recv(self._selectedPackages())._add_(aPackage);
-$recv(self._announcer())._announce_($recv($HLPackageSelected())._on_(aPackage));
+$recv(self._announcer())._announce_($recv($globals.HLPackageSelected)._on_(aPackage));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"selectPackage:",{aPackage:aPackage},$globals.HLSUnitModel)});
@@ -1889,14 +1867,13 @@ selector: "selectedPackages",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $Set(){return $globals.Set||(typeof Set=="undefined"?nil:Set)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@selectedPackages"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@selectedPackages"]=$recv($Set())._new();
+self["@selectedPackages"]=$recv($globals.Set)._new();
 return self["@selectedPackages"];
 } else {
 return $1;
@@ -1920,7 +1897,6 @@ selector: "subscribeToTestSuite:",
 protocol: 'actions',
 fn: function (aTestSuiteRunner){
 var self=this;
-function $ResultAnnouncement(){return $globals.ResultAnnouncement||(typeof ResultAnnouncement=="undefined"?nil:ResultAnnouncement)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1936,7 +1912,7 @@ $ctx1.sendIdx["announcer"]=1;
 $recv($2)._unsubscribe_(self);
 };
 self["@currentSuite"]=aTestSuiteRunner;
-$recv($recv(self["@currentSuite"])._announcer())._on_send_to_($ResultAnnouncement(),"onResultAnnouncement:",self);
+$recv($recv(self["@currentSuite"])._announcer())._on_send_to_($globals.ResultAnnouncement,"onResultAnnouncement:",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"subscribeToTestSuite:",{aTestSuiteRunner:aTestSuiteRunner},$globals.HLSUnitModel)});
@@ -1992,11 +1968,10 @@ protocol: 'accessing',
 fn: function (){
 var self=this;
 var stream;
-function $Array(){return $globals.Array||(typeof Array=="undefined"?nil:Array)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-stream=$recv($recv($Array())._new())._writeStream();
+stream=$recv($recv($globals.Array)._new())._writeStream();
 $recv(self._selectedPackages())._do_((function(package_){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
@@ -2065,14 +2040,13 @@ selector: "testResult",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $TestResult(){return $globals.TestResult||(typeof TestResult=="undefined"?nil:TestResult)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@testResult"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@testResult"]=$recv($TestResult())._new();
+self["@testResult"]=$recv($globals.TestResult)._new();
 return self["@testResult"];
 } else {
 return $1;
@@ -2096,14 +2070,13 @@ selector: "unfilteredSelectedClasses",
 protocol: 'private',
 fn: function (){
 var self=this;
-function $Set(){return $globals.Set||(typeof Set=="undefined"?nil:Set)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@selectedClasses"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@selectedClasses"]=$recv($Set())._new();
+self["@selectedClasses"]=$recv($globals.Set)._new();
 return self["@selectedClasses"];
 } else {
 return $1;
@@ -2127,7 +2100,6 @@ selector: "unselectClass:",
 protocol: 'actions',
 fn: function (aClass){
 var self=this;
-function $HLClassUnselected(){return $globals.HLClassUnselected||(typeof HLClassUnselected=="undefined"?nil:HLClassUnselected)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -2137,7 +2109,7 @@ $recv(self._unfilteredSelectedClasses())._remove_ifAbsent_(aClass,(function(){
 throw $early=[self];
 
 }));
-$recv(self._announcer())._announce_($recv($HLClassUnselected())._on_(aClass));
+$recv(self._announcer())._announce_($recv($globals.HLClassUnselected)._on_(aClass));
 return self;
 }
 catch(e) {if(e===$early)return e[0]; throw e}
@@ -2160,7 +2132,6 @@ selector: "unselectPackage:",
 protocol: 'actions',
 fn: function (aPackage){
 var self=this;
-function $HLPackageUnselected(){return $globals.HLPackageUnselected||(typeof HLPackageUnselected=="undefined"?nil:HLPackageUnselected)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -2170,7 +2141,7 @@ $recv(self._selectedPackages())._remove_ifAbsent_(aPackage,(function(){
 throw $early=[self];
 
 }));
-$recv(self._announcer())._announce_($recv($HLPackageUnselected())._on_(aPackage));
+$recv(self._announcer())._announce_($recv($globals.HLPackageUnselected)._on_(aPackage));
 return self;
 }
 catch(e) {if(e===$early)return e[0]; throw e}
@@ -2199,11 +2170,10 @@ selector: "observeModel",
 protocol: 'initialization',
 fn: function (){
 var self=this;
-function $ResultAnnouncement(){return $globals.ResultAnnouncement||(typeof ResultAnnouncement=="undefined"?nil:ResultAnnouncement)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($recv(self._model())._announcer())._on_send_to_($ResultAnnouncement(),"onResultAnnouncement:",self);
+$recv($recv(self._model())._announcer())._on_send_to_($globals.ResultAnnouncement,"onResultAnnouncement:",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeModel",{},$globals.HLSUnitResultListWidget)});
@@ -2425,14 +2395,13 @@ selector: "model",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $TestResult(){return $globals.TestResult||(typeof TestResult=="undefined"?nil:TestResult)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@model"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@model"]=$recv($TestResult())._new();
+self["@model"]=$recv($globals.TestResult)._new();
 return self["@model"];
 } else {
 return $1;
@@ -2481,11 +2450,10 @@ selector: "observeModel",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $ResultAnnouncement(){return $globals.ResultAnnouncement||(typeof ResultAnnouncement=="undefined"?nil:ResultAnnouncement)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($recv(self._model())._announcer())._on_send_to_($ResultAnnouncement(),"onResultAnnouncement:",self);
+$recv($recv(self._model())._announcer())._on_send_to_($globals.ResultAnnouncement,"onResultAnnouncement:",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeModel",{},$globals.HLSUnitResultStatus)});
@@ -2840,18 +2808,16 @@ selector: "observeModel",
 protocol: 'initialization',
 fn: function (){
 var self=this;
-function $HLRunTests(){return $globals.HLRunTests||(typeof HLRunTests=="undefined"?nil:HLRunTests)}
-function $ResultAnnouncement(){return $globals.ResultAnnouncement||(typeof ResultAnnouncement=="undefined"?nil:ResultAnnouncement)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
 $1=$recv(self._model())._announcer();
-$recv($1)._on_send_to_($HLRunTests(),"onRunTests:",self);
+$recv($1)._on_send_to_($globals.HLRunTests,"onRunTests:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=1;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($ResultAnnouncement(),"onResultAnnouncement:",self);
+$recv($1)._on_send_to_($globals.ResultAnnouncement,"onResultAnnouncement:",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeModel",{},$globals.HLSUnitResults)});
@@ -2945,14 +2911,13 @@ selector: "progressBarWidget",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLProgressBarWidget(){return $globals.HLProgressBarWidget||(typeof HLProgressBarWidget=="undefined"?nil:HLProgressBarWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$2,$receiver;
 $1=self["@progressBarWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-$2=$recv($HLProgressBarWidget())._new();
+$2=$recv($globals.HLProgressBarWidget)._new();
 $recv($2)._label_("");
 self["@progressBarWidget"]=$recv($2)._yourself();
 return self["@progressBarWidget"];
@@ -3006,14 +2971,13 @@ selector: "resultStatusWidget",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLSUnitResultStatus(){return $globals.HLSUnitResultStatus||(typeof HLSUnitResultStatus=="undefined"?nil:HLSUnitResultStatus)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$2,$receiver;
 $1=self["@resultStatusWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-$2=$recv($HLSUnitResultStatus())._new();
+$2=$recv($globals.HLSUnitResultStatus)._new();
 $recv($2)._model_(self._model());
 self["@resultStatusWidget"]=$recv($2)._yourself();
 return self["@resultStatusWidget"];

+ 3 - 6
src/Helios-Transcript.js

@@ -70,11 +70,10 @@ selector: "register",
 protocol: 'registration',
 fn: function (){
 var self=this;
-function $HLTranscriptHandler(){return $globals.HLTranscriptHandler||(typeof HLTranscriptHandler=="undefined"?nil:HLTranscriptHandler)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($HLTranscriptHandler())._register_(self);
+$recv($globals.HLTranscriptHandler)._register_(self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"register",{},$globals.HLTranscript)});
@@ -161,7 +160,6 @@ selector: "unregister",
 protocol: 'registration',
 fn: function (){
 var self=this;
-function $HLTranscriptHandler(){return $globals.HLTranscriptHandler||(typeof HLTranscriptHandler=="undefined"?nil:HLTranscriptHandler)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -173,7 +171,7 @@ $ctx1.supercall = true,
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.supercall = false;
 //>>excludeEnd("ctx");;
-$recv($HLTranscriptHandler())._unregister_(self);
+$recv($globals.HLTranscriptHandler)._unregister_(self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"unregister",{},$globals.HLTranscript)});
@@ -322,14 +320,13 @@ selector: "transcripts",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $OrderedCollection(){return $globals.OrderedCollection||(typeof OrderedCollection=="undefined"?nil:OrderedCollection)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@transcripts"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@transcripts"]=$recv($OrderedCollection())._new();
+self["@transcripts"]=$recv($globals.OrderedCollection)._new();
 return self["@transcripts"];
 } else {
 return $1;

+ 2 - 4
src/Helios-Workspace-Tests.js

@@ -11,13 +11,11 @@ selector: "testKeyMap",
 protocol: 'tests',
 fn: function (){
 var self=this;
-function $HLCodeWidget(){return $globals.HLCodeWidget||(typeof HLCodeWidget=="undefined"?nil:HLCodeWidget)}
-function $HashedCollection(){return $globals.HashedCollection||(typeof HashedCollection=="undefined"?nil:HashedCollection)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-$1=$recv($recv($HLCodeWidget())._pcKeyMap())._isKindOf_($HashedCollection());
+$1=$recv($recv($globals.HLCodeWidget)._pcKeyMap())._isKindOf_($globals.HashedCollection);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["isKindOf:"]=1;
 //>>excludeEnd("ctx");
@@ -25,7 +23,7 @@ self._assert_($1);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["assert:"]=1;
 //>>excludeEnd("ctx");
-self._assert_($recv($recv($HLCodeWidget())._macKeyMap())._isKindOf_($HashedCollection()));
+self._assert_($recv($recv($globals.HLCodeWidget)._macKeyMap())._isKindOf_($globals.HashedCollection));
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"testKeyMap",{},$globals.HLCodeWidgetTest)});

+ 43 - 82
src/Helios-Workspace.js

@@ -11,14 +11,13 @@ selector: "announcer",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $Announcer(){return $globals.Announcer||(typeof Announcer=="undefined"?nil:Announcer)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@announcer"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@announcer"]=$recv($Announcer())._new();
+self["@announcer"]=$recv($globals.Announcer)._new();
 return self["@announcer"];
 } else {
 return $1;
@@ -89,7 +88,6 @@ selector: "doIt:",
 protocol: 'actions',
 fn: function (aString){
 var self=this;
-function $ErrorHandler(){return $globals.ErrorHandler||(typeof ErrorHandler=="undefined"?nil:ErrorHandler)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -105,7 +103,7 @@ return $recv(self._environment())._evaluate_for_(aString,self._receiver());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-$recv($ErrorHandler())._handleError_(e);
+$recv($globals.ErrorHandler)._handleError_(e);
 return nil;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({e:e},$ctx1,2)});
@@ -130,14 +128,13 @@ selector: "environment",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLManager(){return $globals.HLManager||(typeof HLManager=="undefined"?nil:HLManager)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@environment"];
 if(($receiver = $1) == null || $receiver.isNil){
-return $recv($recv($HLManager())._current())._environment();
+return $recv($recv($globals.HLManager)._current())._environment();
 } else {
 return $1;
 };
@@ -305,8 +302,6 @@ protocol: 'actions',
 fn: function (){
 var self=this;
 var result;
-function $Error(){return $globals.Error||(typeof Error=="undefined"?nil:Error)}
-function $ErrorHandler(){return $globals.ErrorHandler||(typeof ErrorHandler=="undefined"?nil:ErrorHandler)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -320,11 +315,11 @@ return self._doIt();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
-}))._on_do_($Error(),(function(exception){
+}))._on_do_($globals.Error,(function(exception){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-throw $early=[$recv($ErrorHandler())._handleError_(exception)];
+throw $early=[$recv($globals.ErrorHandler)._handleError_(exception)];
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({exception:exception},$ctx1,2)});
 //>>excludeEnd("ctx");
@@ -559,7 +554,6 @@ protocol: 'actions',
 fn: function (){
 var self=this;
 var result;
-function $HLDoItExecuted(){return $globals.HLDoItExecuted||(typeof HLDoItExecuted=="undefined"?nil:HLDoItExecuted)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -569,7 +563,7 @@ $1=self._model();
 $ctx1.sendIdx["model"]=1;
 //>>excludeEnd("ctx");
 result=$recv($1)._doIt_(self._currentLineOrSelection());
-$recv($recv(self._model())._announcer())._announce_($recv($HLDoItExecuted())._on_(self["@model"]));
+$recv($recv(self._model())._announcer())._announce_($recv($globals.HLDoItExecuted)._on_(self["@model"]));
 return result;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"doIt",{result:result},$globals.HLCodeWidget)});
@@ -608,7 +602,6 @@ selector: "editorOptions",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HashedCollection(){return $globals.HashedCollection||(typeof HashedCollection=="undefined"?nil:HashedCollection)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -617,7 +610,7 @@ $1="helios.editorTheme"._settingValueIfAbsent_("default");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["settingValueIfAbsent:"]=1;
 //>>excludeEnd("ctx");
-return $globals.HashedCollection._newFromPairs_(["theme",$1,"mode","text/x-stsrc","lineNumbers",true,"enterMode","flat","indentWithTabs",true,"indentUnit",(4),"matchBrackets",true,"electricChars",false,"keyMap","Amber","extraKeys",$recv($HashedCollection())._with_($recv("helios.completionKey"._settingValueIfAbsent_("Shift-Space")).__minus_gt("autocomplete"))]);
+return $globals.HashedCollection._newFromPairs_(["theme",$1,"mode","text/x-stsrc","lineNumbers",true,"enterMode","flat","indentWithTabs",true,"indentUnit",(4),"matchBrackets",true,"electricChars",false,"keyMap","Amber","extraKeys",$recv($globals.HashedCollection)._with_($recv("helios.completionKey"._settingValueIfAbsent_("Shift-Space")).__minus_gt("autocomplete"))]);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"editorOptions",{},$globals.HLCodeWidget)});
 //>>excludeEnd("ctx");
@@ -726,12 +719,11 @@ selector: "messageHintFor:token:",
 protocol: 'hints',
 fn: function (anEditor,aToken){
 var self=this;
-function $Smalltalk(){return $globals.Smalltalk||(typeof Smalltalk=="undefined"?nil:Smalltalk)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-return $recv($recv($recv($recv($recv($Smalltalk())._core())._allSelectors())._asArray())._select_((function(each){
+return $recv($recv($recv($recv($recv($globals.Smalltalk)._core())._allSelectors())._asArray())._select_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -771,14 +763,13 @@ selector: "model",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLCodeModel(){return $globals.HLCodeModel||(typeof HLCodeModel=="undefined"?nil:HLCodeModel)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@model"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@model"]=$recv($HLCodeModel())._new();
+self["@model"]=$recv($globals.HLCodeModel)._new();
 return self["@model"];
 } else {
 return $1;
@@ -821,11 +812,10 @@ selector: "navigateTo:",
 protocol: 'actions',
 fn: function (aString){
 var self=this;
-function $Finder(){return $globals.Finder||(typeof Finder=="undefined"?nil:Finder)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($Finder())._findString_(aString);
+$recv($globals.Finder)._findString_(aString);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"navigateTo:",{aString:aString},$globals.HLCodeWidget)});
@@ -846,11 +836,10 @@ selector: "navigateToReference:",
 protocol: 'actions',
 fn: function (aString){
 var self=this;
-function $HLReferences(){return $globals.HLReferences||(typeof HLReferences=="undefined"?nil:HLReferences)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($recv($HLReferences())._openAsTab())._search_(aString);
+$recv($recv($globals.HLReferences)._openAsTab())._search_(aString);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"navigateToReference:",{aString:aString},$globals.HLCodeWidget)});
@@ -896,8 +885,6 @@ protocol: 'reactions',
 fn: function (aPoint){
 var self=this;
 var ast,node;
-function $Smalltalk(){return $globals.Smalltalk||(typeof Smalltalk=="undefined"?nil:Smalltalk)}
-function $Error(){return $globals.Error||(typeof Error=="undefined"?nil:Error)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -907,11 +894,11 @@ ast=$recv((function(){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
-return $recv($Smalltalk())._parse_($recv(self._editor())._getValue());
+return $recv($globals.Smalltalk)._parse_($recv(self._editor())._getValue());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
-}))._on_do_($Error(),(function(error){
+}))._on_do_($globals.Error,(function(error){
 throw $early=[self];
 
 }));
@@ -1009,7 +996,6 @@ protocol: 'actions',
 fn: function (aString){
 var self=this;
 var start,stop,currentLine;
-function $HashedCollection(){return $globals.HashedCollection||(typeof HashedCollection=="undefined"?nil:HashedCollection)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1019,7 +1005,7 @@ $1=$recv(self["@editor"])._getCursor_(false);
 $ctx1.sendIdx["getCursor:"]=1;
 //>>excludeEnd("ctx");
 currentLine=$recv($1)._line();
-start=$recv($HashedCollection())._new();
+start=$recv($globals.HashedCollection)._new();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=1;
 //>>excludeEnd("ctx");
@@ -1062,7 +1048,7 @@ $ctx2.sendIdx["setSelection:end:"]=1;
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)});
 //>>excludeEnd("ctx");
 }));
-stop=$recv($HashedCollection())._new();
+stop=$recv($globals.HashedCollection)._new();
 $recv(stop)._at_put_("line",currentLine);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["at:put:"]=4;
@@ -1545,7 +1531,6 @@ protocol: 'hints',
 fn: function (anEditor,aToken){
 var self=this;
 var variables,classNames,pseudoVariables;
-function $Smalltalk(){return $globals.Smalltalk||(typeof Smalltalk=="undefined"?nil:Smalltalk)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1568,7 +1553,7 @@ return $recv($recv(each)._asJQuery())._html();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["collect:"]=1;
 //>>excludeEnd("ctx");
-classNames=$recv($recv($Smalltalk())._classes())._collect_((function(each){
+classNames=$recv($recv($globals.Smalltalk)._classes())._collect_((function(each){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -1577,7 +1562,7 @@ return $recv(each)._name();
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,2)});
 //>>excludeEnd("ctx");
 }));
-pseudoVariables=$recv($Smalltalk())._pseudoVariableNames();
+pseudoVariables=$recv($globals.Smalltalk)._pseudoVariableNames();
 $8=$recv($recv(variables).__comma(classNames)).__comma(pseudoVariables);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx[","]=1;
@@ -1651,7 +1636,6 @@ protocol: 'hints',
 fn: function (anEditor,options){
 var self=this;
 var cursor,token,completions,codeMirror;
-function $HLCodeWidget(){return $globals.HLCodeWidget||(typeof HLCodeWidget=="undefined"?nil:HLCodeWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -1672,9 +1656,9 @@ $2=$recv($3)._state();
 $recv($1)._at_put_("state",$2);
 $5=$recv($recv(token)._type()).__eq("variable");
 if($core.assert($5)){
-completions=$recv($HLCodeWidget())._variableHintFor_token_(anEditor,token);
+completions=$recv($globals.HLCodeWidget)._variableHintFor_token_(anEditor,token);
 } else {
-completions=$recv($HLCodeWidget())._messageHintFor_token_(anEditor,token);
+completions=$recv($globals.HLCodeWidget)._messageHintFor_token_(anEditor,token);
 };
 $6=completions;
 $8=$recv(codeMirror)._basicAt_("Pos");
@@ -1743,12 +1727,11 @@ selector: "keyMap",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLManager(){return $globals.HLManager||(typeof HLManager=="undefined"?nil:HLManager)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
-$1=$recv($recv($recv($HLManager())._current())._keyBinder())._systemIsMac();
+$1=$recv($recv($recv($globals.HLManager)._current())._keyBinder())._systemIsMac();
 if($core.assert($1)){
 return self._macKeyMap();
 } else {
@@ -2273,78 +2256,64 @@ selector: "observeBrowserModel",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $HLSaveSourceCode(){return $globals.HLSaveSourceCode||(typeof HLSaveSourceCode=="undefined"?nil:HLSaveSourceCode)}
-function $HLShowInstanceToggled(){return $globals.HLShowInstanceToggled||(typeof HLShowInstanceToggled=="undefined"?nil:HLShowInstanceToggled)}
-function $HLSourceCodeSaved(){return $globals.HLSourceCodeSaved||(typeof HLSourceCodeSaved=="undefined"?nil:HLSourceCodeSaved)}
-function $HLAboutToChange(){return $globals.HLAboutToChange||(typeof HLAboutToChange=="undefined"?nil:HLAboutToChange)}
-function $HLParseErrorRaised(){return $globals.HLParseErrorRaised||(typeof HLParseErrorRaised=="undefined"?nil:HLParseErrorRaised)}
-function $HLCompileErrorRaised(){return $globals.HLCompileErrorRaised||(typeof HLCompileErrorRaised=="undefined"?nil:HLCompileErrorRaised)}
-function $HLUnknownVariableErrorRaised(){return $globals.HLUnknownVariableErrorRaised||(typeof HLUnknownVariableErrorRaised=="undefined"?nil:HLUnknownVariableErrorRaised)}
-function $HLInstVarAdded(){return $globals.HLInstVarAdded||(typeof HLInstVarAdded=="undefined"?nil:HLInstVarAdded)}
-function $HLMethodSelected(){return $globals.HLMethodSelected||(typeof HLMethodSelected=="undefined"?nil:HLMethodSelected)}
-function $HLClassSelected(){return $globals.HLClassSelected||(typeof HLClassSelected=="undefined"?nil:HLClassSelected)}
-function $HLPackageSelected(){return $globals.HLPackageSelected||(typeof HLPackageSelected=="undefined"?nil:HLPackageSelected)}
-function $HLProtocolSelected(){return $globals.HLProtocolSelected||(typeof HLProtocolSelected=="undefined"?nil:HLProtocolSelected)}
-function $HLSourceCodeFocusRequested(){return $globals.HLSourceCodeFocusRequested||(typeof HLSourceCodeFocusRequested=="undefined"?nil:HLSourceCodeFocusRequested)}
-function $HLShowTemplate(){return $globals.HLShowTemplate||(typeof HLShowTemplate=="undefined"?nil:HLShowTemplate)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1;
 $1=$recv(self._browserModel())._announcer();
-$recv($1)._on_send_to_($HLSaveSourceCode(),"onSaveIt",self);
+$recv($1)._on_send_to_($globals.HLSaveSourceCode,"onSaveIt",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=1;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLShowInstanceToggled(),"onShowInstanceToggled",self);
+$recv($1)._on_send_to_($globals.HLShowInstanceToggled,"onShowInstanceToggled",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=2;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLSourceCodeSaved(),"onSourceCodeSaved",self);
+$recv($1)._on_send_to_($globals.HLSourceCodeSaved,"onSourceCodeSaved",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=3;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLAboutToChange(),"onBrowserAboutToChange:",self);
+$recv($1)._on_send_to_($globals.HLAboutToChange,"onBrowserAboutToChange:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=4;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLParseErrorRaised(),"onParseError:",self);
+$recv($1)._on_send_to_($globals.HLParseErrorRaised,"onParseError:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=5;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLCompileErrorRaised(),"onCompileError:",self);
+$recv($1)._on_send_to_($globals.HLCompileErrorRaised,"onCompileError:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=6;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLUnknownVariableErrorRaised(),"onUnknownVariableError:",self);
+$recv($1)._on_send_to_($globals.HLUnknownVariableErrorRaised,"onUnknownVariableError:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=7;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLInstVarAdded(),"onInstVarAdded",self);
+$recv($1)._on_send_to_($globals.HLInstVarAdded,"onInstVarAdded",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=8;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLMethodSelected(),"onMethodSelected:",self);
+$recv($1)._on_send_to_($globals.HLMethodSelected,"onMethodSelected:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=9;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLClassSelected(),"onClassSelected:",self);
+$recv($1)._on_send_to_($globals.HLClassSelected,"onClassSelected:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=10;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLPackageSelected(),"onPackageSelected:",self);
+$recv($1)._on_send_to_($globals.HLPackageSelected,"onPackageSelected:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=11;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLProtocolSelected(),"onProtocolSelected:",self);
+$recv($1)._on_send_to_($globals.HLProtocolSelected,"onProtocolSelected:",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=12;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLSourceCodeFocusRequested(),"onSourceCodeFocusRequested",self);
+$recv($1)._on_send_to_($globals.HLSourceCodeFocusRequested,"onSourceCodeFocusRequested",self);
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["on:send:to:"]=13;
 //>>excludeEnd("ctx");
-$recv($1)._on_send_to_($HLShowTemplate(),"onShowTemplate:",self);
+$recv($1)._on_send_to_($globals.HLShowTemplate,"onShowTemplate:",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeBrowserModel",{},$globals.HLBrowserCodeWidget)});
@@ -2365,11 +2334,10 @@ selector: "observeSystem",
 protocol: 'actions',
 fn: function (){
 var self=this;
-function $MethodModified(){return $globals.MethodModified||(typeof MethodModified=="undefined"?nil:MethodModified)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv($recv(self._browserModel())._systemAnnouncer())._on_send_to_($MethodModified(),"onMethodModified:",self);
+$recv($recv(self._browserModel())._systemAnnouncer())._on_send_to_($globals.MethodModified,"onMethodModified:",self);
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"observeSystem",{},$globals.HLBrowserCodeWidget)});
@@ -2391,7 +2359,6 @@ protocol: 'reactions',
 fn: function (anAnnouncement){
 var self=this;
 var block;
-function $HLChangeForbidden(){return $globals.HLChangeForbidden||(typeof HLChangeForbidden=="undefined"?nil:HLChangeForbidden)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
@@ -2409,7 +2376,7 @@ return $recv(block)._value();
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)});
 //>>excludeEnd("ctx");
 }));
-$recv($HLChangeForbidden())._signal();
+$recv($globals.HLChangeForbidden)._signal();
 };
 return self;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -2651,13 +2618,12 @@ protocol: 'reactions',
 fn: function (anAnnouncement){
 var self=this;
 var lineIndex,newContents;
-function $String(){return $globals.String||(typeof String=="undefined"?nil:String)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$3,$2,$6,$5,$4;
 lineIndex=(1);
-self._contents_($recv($String())._streamContents_((function(stream){
+self._contents_($recv($globals.String)._streamContents_((function(stream){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -2707,7 +2673,7 @@ $recv(stream)._nextPutAll_(each);
 $ctx3.sendIdx["nextPutAll:"]=6;
 //>>excludeEnd("ctx");
 };
-$recv(stream)._nextPutAll_($recv($String())._cr());
+$recv(stream)._nextPutAll_($recv($globals.String)._cr());
 lineIndex=$recv(lineIndex).__plus((1));
 return lineIndex;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
@@ -2920,12 +2886,11 @@ protocol: 'reactions',
 fn: function (anAnnouncement){
 var self=this;
 var error;
-function $String(){return $globals.String||(typeof String=="undefined"?nil:String)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 error=$recv(anAnnouncement)._error();
-self._confirm_ifTrue_($recv($String())._streamContents_((function(stream){
+self._confirm_ifTrue_($recv($globals.String)._streamContents_((function(stream){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -2933,7 +2898,7 @@ $recv(stream)._nextPutAll_($recv(error)._messageText());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["nextPutAll:"]=1;
 //>>excludeEnd("ctx");
-$recv(stream)._nextPutAll_($recv($String())._cr());
+$recv(stream)._nextPutAll_($recv($globals.String)._cr());
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx2.sendIdx["nextPutAll:"]=2;
 //>>excludeEnd("ctx");
@@ -3178,14 +3143,13 @@ selector: "codeWidget",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLCodeWidget(){return $globals.HLCodeWidget||(typeof HLCodeWidget=="undefined"?nil:HLCodeWidget)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@codeWidget"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@codeWidget"]=$recv($HLCodeWidget())._new();
+self["@codeWidget"]=$recv($globals.HLCodeWidget)._new();
 return self["@codeWidget"];
 } else {
 return $1;
@@ -3232,12 +3196,10 @@ selector: "renderContentOn:",
 protocol: 'rendering',
 fn: function (html){
 var self=this;
-function $HLContainer(){return $globals.HLContainer||(typeof HLContainer=="undefined"?nil:HLContainer)}
-function $HLHorizontalSplitter(){return $globals.HLHorizontalSplitter||(typeof HLHorizontalSplitter=="undefined"?nil:HLHorizontalSplitter)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-$recv(html)._with_($recv($HLContainer())._with_($recv($HLHorizontalSplitter())._with_with_(self._codeWidget(),(function(canvas){
+$recv(html)._with_($recv($globals.HLContainer)._with_($recv($globals.HLHorizontalSplitter)._with_with_(self._codeWidget(),(function(canvas){
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx2) {
 //>>excludeEnd("ctx");
@@ -3316,14 +3278,13 @@ selector: "transcript",
 protocol: 'accessing',
 fn: function (){
 var self=this;
-function $HLTranscript(){return $globals.HLTranscript||(typeof HLTranscript=="undefined"?nil:HLTranscript)}
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$receiver;
 $1=self["@transcript"];
 if(($receiver = $1) == null || $receiver.isNil){
-self["@transcript"]=$recv($HLTranscript())._new();
+self["@transcript"]=$recv($globals.HLTranscript)._new();
 return self["@transcript"];
 } else {
 return $1;