Remove service.Class.children, and (mostly) as a side-effect sort the class hierarchy view.

runtime/bin/vmservice/observatory/lib/src/service/object.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of service;
 
 /// A [ServiceObject] is an object known to the VM service and is tied
 /// to an owning [Isolate].
 abstract class ServiceObject extends Observable {
   static int LexicalSortName(ServiceObject o1, ServiceObject o2) {
@@ skipping 665 matching lines @@
       }
     }
     return Future.wait(futureClasses);
   }
 
   /// Builds the class hierarchy and returns the Object class.
   Future<Class> _buildClassHierarchy(List<Class> classes) {
     rootClasses.clear();
     objectClass = null;
     for (var cls in classes) {
-      if (cls.superClass == null) {
+      if (cls.superclass == null) {
         rootClasses.add(cls);
       }
       if ((cls.vmName == 'Object') && (cls.isPatch == false)) {
         objectClass = cls;
       }
     }
     assert(objectClass != null);
     return new Future.value(objectClass);
   }
 
@@ skipping 578 matching lines @@
     current.instances = stats[LIVE_AFTER_GC] + stats[ALLOCATED_SINCE_GC];
     current.bytes = stats[LIVE_AFTER_GC_SIZE] + stats[ALLOCATED_SINCE_GC_SIZE];
   }
 
   bool get empty => accumulated.empty && current.empty;
 }
 
 class Class extends ServiceObject with Coverage {
   @observable Library library;
   @observable Script script;
-  @observable Class superClass;
 
   @observable bool isAbstract;
   @observable bool isConst;
   @observable bool isFinalized;
   @observable bool isPatch;
   @observable bool isImplemented;
 
   @observable int tokenPos;
   @observable int endTokenPos;
 
   @observable ServiceMap error;
 
   final Allocations newSpace = new Allocations();
   final Allocations oldSpace = new Allocations();
   final AllocationCount promotedByLastNewGC = new AllocationCount();
 
   bool get hasNoAllocations => newSpace.empty && oldSpace.empty;
 
-  @reflectable final children = new ObservableList<Class>();
-  @reflectable final subClasses = new ObservableList<Class>();
   @reflectable final fields = new ObservableList<ServiceMap>();
   @reflectable final functions = new ObservableList<ServiceFunction>();
+
+  @observable Class superclass;
   @reflectable final interfaces = new ObservableList<Class>();
+  @reflectable final subclasses = new ObservableList<Class>();
 
   bool get canCache => true;
   bool get immutable => false;
 
   Class._empty(ServiceObjectOwner owner) : super._empty(owner);
 
   String toString() {
     return 'Service Class: $vmName';
   }
 
@@ skipping 22 matching lines @@
 
     isAbstract = map['abstract'];
     isConst = map['const'];
     isFinalized = map['finalized'];
     isPatch = map['patch'];
     isImplemented = map['implemented'];
 
     tokenPos = map['tokenPos'];
     endTokenPos = map['endTokenPos'];
 
-    subClasses.clear();
-    subClasses.addAll(map['subclasses']);
-    subClasses.sort(ServiceObject.LexicalSortName);
+    subclasses.clear();
+    subclasses.addAll(map['subclasses']);
+    subclasses.sort(ServiceObject.LexicalSortName);
 
     fields.clear();
     fields.addAll(map['fields']);
     fields.sort(ServiceObject.LexicalSortName);
 
     functions.clear();
     functions.addAll(map['functions']);
     functions.sort(ServiceObject.LexicalSortName);
 
-    superClass = map['super'];
-    if (superClass != null) {
-      superClass._addToChildren(this);
+    superclass = map['super'];
+    // Work-around Object not tracking its subclasses in the VM.
+    if (superclass != null && superclass.name == "Object") {
+      superclass._addSubclass(this);
     }
     error = map['error'];
 
     var allocationStats = map['allocationStats'];
     if (allocationStats != null) {
       newSpace.update(allocationStats['new']);
       oldSpace.update(allocationStats['old']);
       promotedByLastNewGC.instances = allocationStats['promotedInstances'];
       promotedByLastNewGC.bytes = allocationStats['promotedBytes'];
     }
   }
 
-  void _addToChildren(Class cls) {
-    if (children.contains(cls)) {
+  void _addSubclass(Class subclass) {
+    if (subclasses.contains(subclass)) {
       return;
     }
-    children.add(cls);
+    subclasses.add(subclass);
+    subclasses.sort(ServiceObject.LexicalSortName);
   }
 
   Future<ServiceObject> get(String command) {
     return isolate.get(id + "/$command");
   }
 }
 
 // TODO(koda): Sync this with VM.
 class FunctionKind {
   final String _strValue;
@@ skipping 867 matching lines @@
     var v = list[i];
     if ((v is ObservableMap) && _isServiceMap(v)) {
       list[i] = owner.getFromMap(v);
     } else if (v is ObservableList) {
       _upgradeObservableList(v, owner);
     } else if (v is ObservableMap) {
       _upgradeObservableMap(v, owner);
     }
   }
 }