Converted Observatory vm-view && isolate-view elements

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;
 
 // Some value smaller than the object ring, so requesting a large array
 // doesn't result in an expired ref because the elements lapped it in the
 // object ring.
 const int kDefaultFieldLimit = 100;
@@ skipping 1227 matching lines @@
   @observable Duration get upTime {
     if (startTime == null) {
       return null;
     }
     return (new DateTime.now().difference(startTime));
   }
 
   @observable Map counters = {};
 
   void _updateRunState() {
-    topFrame = (pauseEvent != null ? pauseEvent.topFrame : null);
+    topFrame = M.topFrame(pauseEvent);
     paused = (pauseEvent != null &&
-              pauseEvent.kind != ServiceEvent.kResume);
+              !(pauseEvent is M.ResumeEvent));
     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 M.DebugEvent pauseEvent = null;
   @observable bool paused = false;
   @observable bool running = false;
   @observable bool idle = false;
   @observable bool loading = true;
   @observable bool runnable = false;
   @observable bool ioEnabled = false;
   @observable bool reloading = false;
+  M.IsolateStatus get status {
+    if (paused) {
+      return M.IsolateStatus.paused;
+    }
+    if (running) {
+      return M.IsolateStatus.running;
+    }
+    if (idle) {
+      return M.IsolateStatus.idle;
+    }
+    return M.IsolateStatus.loading;
+  }
 
   final List<String> extensionRPCs = new List<String>();
 
   Map<String,ServiceObject> _cache = new Map<String,ServiceObject>();
   final TagProfile tagProfile = new TagProfile(20);
 
   Isolate._empty(ServiceObjectOwner owner) : super._empty(owner) {
     assert(owner is VM);
   }
 
@@ skipping 284 matching lines @@
     if (map['_debuggerSettings'] != null) {
       exceptionsPauseInfo = map['_debuggerSettings']['_exceptions'];
     } else {
       exceptionsPauseInfo = "none";
     }
 
     var newPauseEvent = map['pauseEvent'];
     assert((pauseEvent == null) ||
            (newPauseEvent == null) ||
            !newPauseEvent.timestamp.isBefore(pauseEvent.timestamp));
-    pauseEvent = newPauseEvent;
+    pauseEvent = createEventFromServiceEvent(newPauseEvent);
     _updateRunState();
     error = map['error'];
 
     libraries.clear();
     libraries.addAll(map['libraries']);
     libraries.sort(ServiceObject.LexicalSortName);
     if (savedStartTime == null) {
       vm._buildIsolateList();
     }
 
@@ skipping 69 matching lines @@
 
       case ServiceEvent.kPauseStart:
       case ServiceEvent.kPauseExit:
       case ServiceEvent.kPauseBreakpoint:
       case ServiceEvent.kPauseInterrupted:
       case ServiceEvent.kPauseException:
       case ServiceEvent.kNone:
       case ServiceEvent.kResume:
         assert((pauseEvent == null) ||
                !event.timestamp.isBefore(pauseEvent.timestamp));
-        pauseEvent = event;
+        pauseEvent = createEventFromServiceEvent(event);
         _updateRunState();
         break;
 
       case ServiceEvent.kGraph:
         _loadHeapSnapshot(event);
         break;
 
       case ServiceEvent.kGC:
         // Ignore GC events for now.
         break;
@@ skipping 539 matching lines @@
     if (newScript != null && newScript.loaded) {
       newScript._addBreakpoint(this);
     }
 
     isSyntheticAsyncContinuation = map['isSyntheticAsyncContinuation'] != null;
 
     assert(resolved || location is UnresolvedSourceLocation);
   }
 
   void remove() {
-    // Remove any references to this breakpoint.  It has been removed.
     location.script._removeBreakpoint(this);
-    if ((isolate.pauseEvent != null) &&
-        (isolate.pauseEvent.breakpoint != null) &&
-        (isolate.pauseEvent.breakpoint.id == id)) {
-      isolate.pauseEvent.breakpoint = null;
-    }
   }
 
   String toString() {
     if (number != null) {
       if (isSyntheticAsyncContinuation) {
         return 'Synthetic Async Continuation Breakpoint ${number}';
       } else {
         return 'Breakpoint ${number} at ${location}';
       }
     } else {
@@ skipping 2213 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);
     }
   }
 }