Refactor Observatory

runtime/bin/vmservice/client/lib/src/observatory_elements/instance_ref.dart

 // Copyright (c) 2013, 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 instance_ref_element;
 
 import 'package:logging/logging.dart';
 import 'package:polymer/polymer.dart';
 import 'service_ref.dart';
 
 @CustomTag('instance-ref')
 class InstanceRefElement extends ServiceRefElement {
   InstanceRefElement.created() : super.created();
 
   String get name {
     if (ref == null) {
       return super.name;
     }
     return ref['preview'];
   }
 
   // TODO(turnidge): This is here to workaround vm/dart2js differences.
   dynamic expander() {
     return expandEvent;
   }
 
   void expandEvent(bool expand, var done) {
     print("Calling expandEvent");
     if (expand) {
-      app.requestManager.requestMap(url).then((map) {
-          print("Result is : $map");
-          ref['fields'] = map['fields'];
-          ref['elements'] = map['elements'];
-          ref['length'] = map['length'];
-          print("ref is $ref");
+      isolate.getMap(objectId).then((map) {
+        print(map.runtimeType);
+        print(map);

[turnidge, 2014/03/05 21:02:47]

debug

[Cutch, 2014/03/05 21:54:23]

Done.

+        ref['fields'] = map['fields'];
+        ref['elements'] = map['elements'];
+        ref['length'] = map['length'];
+        print("ref is $ref");

[turnidge, 2014/03/05 21:02:47]

debug

[Cutch, 2014/03/05 21:54:23]

Done.

       }).catchError((e, trace) {
           Logger.root.severe('Error while expanding instance-ref: $e\n$trace');
       }).whenComplete(done);
     } else {
       ref['fields'] = null;
       ref['elements'] = null;
       done();
     }
   }
 }