Refactor Observatory

runtime/bin/vmservice/client/lib/src/elements/heap_profile.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.
 
 library heap_profile_element;
 
 import 'dart:html';
+import 'isolate_element.dart';
 import 'package:logging/logging.dart';
 import 'package:polymer/polymer.dart';
-import 'observatory_element.dart';
+import 'package:observatory/app.dart';
 
 /// Displays an Error response.
 @CustomTag('heap-profile')
-class HeapProfileElement extends ObservatoryElement {
+class HeapProfileElement extends IsolateElement {
   // Indexes into VM provided map.
   static const ALLOCATED_BEFORE_GC = 0;
   static const ALLOCATED_BEFORE_GC_SIZE = 1;
   static const LIVE_AFTER_GC = 2;
   static const LIVE_AFTER_GC_SIZE = 3;
   static const ALLOCATED_SINCE_GC = 4;
   static const ALLOCATED_SINCE_GC_SIZE = 5;
   static const ACCUMULATED = 6;
   static const ACCUMULATED_SIZE = 7;
 
@@ skipping 73 matching lines @@
     assert(_fullDataTable != null);
     assert(_combinedDataTable != null);
     _fullDataTable.clearRows();
     _combinedDataTable.clearRows();
     for (Map cls in profile['members']) {
       if (_classHasNoAllocations(cls)) {
         // If a class has no allocations, don't display it.
         continue;
       }
       var vm_name = cls['class']['name'];
-      var url =
-          app.locationManager.currentIsolateRelativeLink(cls['class']['id']);
+      var url = isolate.relativeLink(cls['class']['id']);
       _fullDataTable.addRow([
           '<a title="$vm_name" href="$url">'
           '${_fullTableColumnValue(cls, 0)}</a>',
           _fullTableColumnValue(cls, 1),
           _fullTableColumnValue(cls, 2),
           _fullTableColumnValue(cls, 3),
           _fullTableColumnValue(cls, 4),
           _fullTableColumnValue(cls, 5),
           _fullTableColumnValue(cls, 6),
           _fullTableColumnValue(cls, 7),
@@ skipping 96 matching lines @@
       case 5:
         return v['new'][ALLOCATED_BEFORE_GC_SIZE] +
                v['old'][ALLOCATED_BEFORE_GC_SIZE];
       case 6:
         return v['new'][LIVE_AFTER_GC_SIZE] + v['old'][LIVE_AFTER_GC_SIZE];
     }
     throw new FallThroughError();
   }
 
   void refresh(var done) {
-    var isolateId = app.locationManager.currentIsolateId();
-    var isolate = app.isolateManager.getIsolate(isolateId);
-    if (isolate == null) {
-      Logger.root.info('No isolate found.');
-      return;
-    }
-    var request = '/$isolateId/allocationprofile';
-    app.requestManager.requestMap(request).then((Map response) {
+    isolate.getMap('/allocationprofile').then((Map response) {
       assert(response['type'] == 'AllocationProfile');
       profile = response;
     }).catchError((e, st) {
       Logger.root.info('$e $st');
     }).whenComplete(done);
   }
 
   void resetAccumulator(Event e, var detail, Node target) {
-    var isolateId = app.locationManager.currentIsolateId();
-    var isolate = app.isolateManager.getIsolate(isolateId);
-    if (isolate == null) {
-      Logger.root.info('No isolate found.');
-      return;
-    }
-    var request = '/$isolateId/allocationprofile/reset';
-    app.requestManager.requestMap(request).then((Map response) {
+    isolate.getMap('/allocationprofile/reset').then((Map response) {
       assert(response['type'] == 'AllocationProfile');
       profile = response;
     }).catchError((e, st) {
       Logger.root.info('$e $st');
     });
   }
 
   void profileChanged(oldValue) {
     _updateChartData();
     notifyPropertyChange(#formattedAverage, [], formattedAverage);
@@ skipping 23 matching lines @@
 
   @observable String formattedTotalCollectionTime(bool newSpace) {
     if (profile == null) {
       return '';
     }
     String space = newSpace ? 'new' : 'old';
     Map heap = profile['heaps'][space];
     return '${ObservatoryApplication.timeUnits(heap['time'])} secs';
   }
 }