kernel: .classes => .traitsOrClasses.

API-CHANGES.txt

@@ -1,6 +1,8 @@
 0.20.0:
 
 * Remove amber/boot api globalJsVariables.
+* Rename amber/boot apis:
+  * classes => traitsOrClasses.
 
 - SmalltalkImage >>
   - legacyGlobalJsVariables

src/Kernel-Infrastructure.js

@@ -3081,17 +3081,17 @@ var self=this,$self=this;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-return $recv($recv($self._core())._classes())._copy();
+return $recv($recv($self._core())._traitsOrClasses())._copy();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 }, function($ctx1) {$ctx1.fill(self,"classes",{},$globals.SmalltalkImage)});
 //>>excludeEnd("ctx");
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: [],
-source: "classes\x0a\x09^ self core classes copy",
+source: "classes\x0a\x09^ self core traitsOrClasses copy",
 referencedClasses: [],
 //>>excludeEnd("ide");
-messageSends: ["copy", "classes", "core"]
+messageSends: ["copy", "traitsOrClasses", "core"]
 }),
 $globals.SmalltalkImage);
 

src/Kernel-Infrastructure.st

@@ -905,7 +905,7 @@ defaultAmdNamespace: aString
 !SmalltalkImage methodsFor: 'classes'!
 
 classes
-	^ self core classes copy
+	^ self core traitsOrClasses copy
 !
 
 removeClass: aClass

support/kernel-fundamentals.js

@@ -140,9 +140,9 @@ define(function () {
         var addElement = brikz.arraySet.addElement;
         var removeElement = brikz.arraySet.removeElement;
 
-        /* Smalltalk classes */
+        /* Smalltalk classes and traits */
 
-        var classes = [];
+        var traitsOrClasses = [];
 
         this.buildTraitOrClass = function (category, builder) {
             // TODO remove .className, have .name
@@ -160,13 +160,13 @@ define(function () {
 
         function addTraitOrClass (traitOrClass) {
             globals[traitOrClass.className] = traitOrClass;
-            addElement(classes, traitOrClass);
+            addElement(traitsOrClasses, traitOrClass);
             traitOrClass.added();
         }
 
         function removeTraitOrClass (traitOrClass) {
             traitOrClass.removed();
-            removeElement(classes, traitOrClass);
+            removeElement(traitsOrClasses, traitOrClass);
             delete globals[traitOrClass.className];
         }
 
@@ -178,9 +178,7 @@ define(function () {
             globals[alias] = traitOrClass;
         };
 
-        /* Answer all registered Smalltalk classes */
-        // TODO: remove .classes, have .traitsOrClasses
-        st.classes = this.classes = classes;
+        st.traitsOrClasses = this.traitsOrClasses = traitsOrClasses;
     }
 
     MethodsBrik.deps = ["event", "selectors", "root", "selectorConversion"];

support/kernel-runtime.js

@@ -64,7 +64,7 @@ define(function () {
     RuntimeClassesBrik.deps = ["event", "selectors", "dnu", "behaviors", "classes", "manipulation"];
     function RuntimeClassesBrik (brikz, st) {
         var selectors = brikz.selectors;
-        var classes = brikz.behaviors.classes;
+        var traitsOrClasses = brikz.behaviors.traitsOrClasses;
         var wireKlass = brikz.classes.wireKlass;
         var installMethod = brikz.manipulation.installMethod;
         var installJSMethod = brikz.manipulation.installJSMethod;
@@ -74,7 +74,7 @@ define(function () {
 
         function markClassDetachedRoot (klass) {
             klass.detachedRoot = true;
-            detachedRootClasses = classes.filter(function (klass) {
+            detachedRootClasses = traitsOrClasses.filter(function (klass) {
                 return klass.detachedRoot;
             });
         }
@@ -93,7 +93,7 @@ define(function () {
             }
         }
 
-        classes.forEach(function (traitOrClass) {
+        traitsOrClasses.forEach(function (traitOrClass) {
             if (!traitOrClass.trait) initClassAndMetaclass(traitOrClass);
         });