Refactor Observatory

runtime/bin/vmservice/client/lib/src/observatory_elements/service_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 service_ref_element;
 
 import 'package:polymer/polymer.dart';
-import 'observatory_element.dart';
+import 'isolate_element.dart';
 
 @CustomTag('service-ref')
-class ServiceRefElement extends ObservatoryElement {
+class ServiceRefElement extends IsolateElement {
   @published Map ref;
   @published bool internal = false;
-  @published Isolate isolate = null;
   ServiceRefElement.created() : super.created();
 
   void refChanged(oldValue) {
     notifyPropertyChange(#url, "", url);
     notifyPropertyChange(#name, [], name);
     notifyPropertyChange(#hoverText, "", hoverText);
   }
 
   String get url {
-    if (ref != null) {
-      return relativeLink(ref['id']);
+    if ((isolate == null) || (ref == null)) {
+      return '';
     }
-    return '';
+    return isolate.hashLink(objectId);
   }
 
+  String get objectId => ref['id'];

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

Should we check for ref == null?

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

Done.

+
   String get hoverText {
     if (ref == null) {
       return '';
     }
     // Return the VM name by default.
     var name = ref['name'];
     return name != null ? name : '';
   }
 
   String get name {
     if (ref == null) {
       return 'NULL REF';
     }
     String name_key = internal ? 'name' : 'user_name';
     if (ref[name_key] != null) {
       return ref[name_key];
     } else if (ref['name'] != null) {
       return ref['name'];
     } else if (ref['user_name'] != null) {
       return ref['user_name'];
     }
     return '';
   }
-
-  void isolateChanged(oldValue) {
-    notifyPropertyChange(#relativeLink, 0, 1);
-  }
-
-  @observable
-  String relativeLink(String link) {
-    if (app == null) {
-      return '';
-    } else if (isolate == null) {
-      return app.locationManager.currentIsolateRelativeLink(link);
-    } else {
-      return app.locationManager.relativeLink(isolate.id, link);
-    }
-  }
 }