Standardize on using "kind" to distinguish sub-varieties of a type.

runtime/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;
 
 /// An RpcException represents an exceptional event that happened
 /// while invoking an rpc.
 abstract class RpcException implements Exception {
   RpcException(this.message);
@@ skipping 437 matching lines @@
     }
 
     var eventIsolate = map['isolate'];
     if (eventIsolate == null) {
       var event = new ServiceObject._fromMap(vm, map);
       events.add(event);
     } else {
       // getFromMap creates the Isolate if it hasn't been seen already.
       var isolate = getFromMap(map['isolate']);
       var event = new ServiceObject._fromMap(isolate, map);
-      if (event.eventType == ServiceEvent.kIsolateExit) {
+      if (event.kind == ServiceEvent.kIsolateExit) {
         _removeIsolate(isolate.id);
       }
       isolate._onEvent(event);
       events.add(event);
     }
   }
 
   void _removeIsolate(String isolateId) {
     assert(_isolateCache.containsKey(isolateId));
     _isolateCache.remove(isolateId);
@@ skipping 337 matching lines @@
   @observable int number;
   @observable DateTime startTime;
   @observable Duration get upTime =>
       (new DateTime.now().difference(startTime));
 
   @observable ObservableMap counters = new ObservableMap();
 
   void _updateRunState() {
     topFrame = (pauseEvent != null ? pauseEvent.topFrame : null);
     paused = (pauseEvent != null &&
-              pauseEvent.eventType != ServiceEvent.kResume);
+              pauseEvent.kind != ServiceEvent.kResume);
     running = (!paused && topFrame != null);
     idle = (!paused && topFrame == null);
     notifyPropertyChange(#topFrame, 0, 1);
     notifyPropertyChange(#paused, 0, 1);
     notifyPropertyChange(#running, 0, 1);
     notifyPropertyChange(#idle, 0, 1);
   }
 
   @observable ServiceEvent pauseEvent = null;
   @observable bool paused = false;
@@ skipping 298 matching lines @@
   void _addBreakpoint(Breakpoint bpt) {
     breakpoints[bpt.number] = bpt;
   }
 
   void _removeBreakpoint(Breakpoint bpt) {
     breakpoints.remove(bpt.number);
     bpt.remove();
   }
 
   void _onEvent(ServiceEvent event) {
-    switch(event.eventType) {
+    switch(event.kind) {
       case ServiceEvent.kIsolateStart:
       case ServiceEvent.kIsolateExit:
       case ServiceEvent.kInspect:
         // Handled elsewhere.
         break;
 
       case ServiceEvent.kBreakpointAdded:
         _addBreakpoint(event.breakpoint);
         break;
 
@@ skipping 276 matching lines @@
     stacktrace = new ServiceObject._fromMap(owner, map['stacktrace']);
     name = 'DartError($message)';
     vmName = name;
   }
 
   String toString() => 'DartError($message)';
 }
 
 /// A [ServiceEvent] is an asynchronous event notification from the vm.
 class ServiceEvent extends ServiceObject {
-  /// The possible 'eventType' values.
+  /// The possible 'kind' values.
   static const kIsolateStart       = 'IsolateStart';
   static const kIsolateExit        = 'IsolateExit';
   static const kIsolateUpdate      = 'IsolateUpdate';
   static const kPauseStart         = 'PauseStart';
   static const kPauseExit          = 'PauseExit';
   static const kPauseBreakpoint    = 'PauseBreakpoint';
   static const kPauseInterrupted   = 'PauseInterrupted';
   static const kPauseException     = 'PauseException';
   static const kResume             = 'Resume';
   static const kBreakpointAdded    = 'BreakpointAdded';
   static const kBreakpointResolved = 'BreakpointResolved';
   static const kBreakpointRemoved  = 'BreakpointRemoved';
   static const kGraph              = '_Graph';
   static const kGC                 = 'GC';
   static const kInspect            = 'Inspect';
   static const kConnectionClosed   = 'ConnectionClosed';
 
   ServiceEvent._empty(ServiceObjectOwner owner) : super._empty(owner);
 
   ServiceEvent.connectionClosed(this.reason) : super._empty(null) {
-    eventType = kConnectionClosed;
+    kind = kConnectionClosed;
   }
 
-  @observable String eventType;
+  @observable String kind;
   @observable Breakpoint breakpoint;
   @observable ServiceMap topFrame;
   @observable ServiceMap exception;
   @observable ServiceObject inspectee;
   @observable ByteData data;
   @observable int count;
   @observable String reason;
   int chunkIndex, chunkCount, nodeCount;
 
   @observable bool get isPauseEvent {
-    return (eventType == kPauseStart ||
-            eventType == kPauseExit ||
-            eventType == kPauseBreakpoint ||
-            eventType == kPauseInterrupted ||
-            eventType == kPauseException);
+    return (kind == kPauseStart ||
+            kind == kPauseExit ||
+            kind == kPauseBreakpoint ||
+            kind == kPauseInterrupted ||
+            kind == kPauseException);
   }
 
   void _update(ObservableMap map, bool mapIsRef) {
     _loaded = true;
     _upgradeCollection(map, owner);
     assert(map['isolate'] == null || owner == map['isolate']);
-    eventType = map['eventType'];
+    kind = map['kind'];
     notifyPropertyChange(#isPauseEvent, 0, 1);
-    name = 'ServiceEvent $eventType';
+    name = 'ServiceEvent $kind';
     vmName = name;
     if (map['breakpoint'] != null) {
       breakpoint = map['breakpoint'];
     }
     if (map['topFrame'] != null) {
       topFrame = map['topFrame'];
     }
     if (map['exception'] != null) {
       exception = map['exception'];
     }
@@ skipping 12 matching lines @@
     if (map['nodeCount'] != null) {
       nodeCount = map['nodeCount'];
     }
     if (map['count'] != null) {
       count = map['count'];
     }
   }
 
   String toString() {
     if (data == null) {
-      return "ServiceEvent(owner='${owner.id}', type='${eventType}')";
+      return "ServiceEvent(owner='${owner.id}', kind='${kind}')";
     } else {
-      return "ServiceEvent(owner='${owner.id}', type='${eventType}', "
+      return "ServiceEvent(owner='${owner.id}', kind='${kind}', "
           "data.lengthInBytes=${data.lengthInBytes})";
     }
   }
 }
 
 class Breakpoint extends ServiceObject {
   Breakpoint._empty(ServiceObjectOwner owner) : super._empty(owner);
 
   // TODO(turnidge): Add state to track if a breakpoint has been
   // removed from the program.  Remove from the cache when deleted.
@@ skipping 1631 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);
     }
   }
 }