Refactor Observatory

runtime/bin/vmservice/client/lib/src/elements/service_ref.dart

Index: runtime/bin/vmservice/client/lib/src/elements/service_ref.dart
diff --git a/runtime/bin/vmservice/client/lib/src/observatory_elements/service_ref.dart b/runtime/bin/vmservice/client/lib/src/elements/service_ref.dart
similarity index 68%
rename from runtime/bin/vmservice/client/lib/src/observatory_elements/service_ref.dart
rename to runtime/bin/vmservice/client/lib/src/elements/service_ref.dart
index 9b3feb2090c9436fb520ad51620992bb15633de0..00c41759d254b778599a99b5cfaf0a0b732e39e2 100644
--- a/runtime/bin/vmservice/client/lib/src/observatory_elements/service_ref.dart
+++ b/runtime/bin/vmservice/client/lib/src/elements/service_ref.dart
@@ -5,13 +5,12 @@
 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) {
@@ -21,12 +20,14 @@ class ServiceRefElement extends ObservatoryElement {
   }
 
   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 == null ? '' : ref['id'];
+
   String get hoverText {
     if (ref == null) {
       return '';
@@ -50,19 +51,4 @@ class ServiceRefElement extends ObservatoryElement {
     }
     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);
-    }
-  }
 }