Revert "Address additional analysis issues in the observatory codebase."

runtime/observatory/lib/src/elements/debugger.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 debugger_page_element;
 
 import 'dart:async';
+import 'dart:svg';
 import 'dart:html';
 import 'dart:math';
-import 'dart:svg';
-
-import 'package:logging/logging.dart';
+import 'package:observatory/event.dart';
+import 'package:observatory/models.dart' as M;
 import 'package:observatory/app.dart';
 import 'package:observatory/cli.dart';
 import 'package:observatory/debugger.dart';
-import 'package:observatory/event.dart';
-import 'package:observatory/models.dart' as M;
-import 'package:observatory/service.dart' as S;
-import 'package:observatory/service_common.dart';
 import 'package:observatory/src/elements/function_ref.dart';
 import 'package:observatory/src/elements/helpers/any_ref.dart';
 import 'package:observatory/src/elements/helpers/nav_bar.dart';
 import 'package:observatory/src/elements/helpers/nav_menu.dart';
 import 'package:observatory/src/elements/helpers/rendering_scheduler.dart';
 import 'package:observatory/src/elements/helpers/tag.dart';
 import 'package:observatory/src/elements/helpers/uris.dart';
 import 'package:observatory/src/elements/instance_ref.dart';
 import 'package:observatory/src/elements/nav/isolate_menu.dart';
 import 'package:observatory/src/elements/nav/notify.dart';
 import 'package:observatory/src/elements/nav/top_menu.dart';
 import 'package:observatory/src/elements/nav/vm_menu.dart';
 import 'package:observatory/src/elements/source_inset.dart';
 import 'package:observatory/src/elements/source_link.dart';
+import 'package:observatory/service.dart' as S;
+import 'package:logging/logging.dart';
 
 // TODO(turnidge): Move Debugger, DebuggerCommand to debugger library.
 abstract class DebuggerCommand extends Command {
   ObservatoryDebugger debugger;
 
   DebuggerCommand(this.debugger, name, children) : super(name, children);
 
   String get helpShort;
   String get helpLong;
 }
@@ skipping 1152 matching lines @@
       debugger.console.print("No connected VMs");
       return;
     }
     // TODO(turnidge): Right now there is only one vm listed.
     var vmList = [debugger.vm];
 
     var maxAddrLen = 'ADDRESS'.length;
     var maxNameLen = 'NAME'.length;
 
     for (var vm in vmList) {
-      maxAddrLen = max(
-          maxAddrLen, (vm as CommonWebSocketVM).target.networkAddress.length);
+      maxAddrLen = max(maxAddrLen, vm.target.networkAddress.length);
       maxNameLen = max(maxNameLen, vm.name.length);
     }
 
     debugger.console.print("${'ADDRESS'.padRight(maxAddrLen, ' ')} "
         "${'NAME'.padRight(maxNameLen, ' ')} "
         "CURRENT");
     for (var vm in vmList) {
       String current = (vm == debugger.vm ? '*' : '');
       debugger.console
           .print("${vm.target.networkAddress.padRight(maxAddrLen, ' ')} "
@@ skipping 465 matching lines @@
     if (bpt.resolved) {
       console.print('Breakpoint ${bpId} ${verb} at ${locString}');
     } else {
       console.print('Future breakpoint ${bpId} ${verb} at ${locString}');
     }
   }
 
   void onEvent(S.ServiceEvent event) {
     switch (event.kind) {
       case S.ServiceEvent.kVMUpdate:
-        CommonWebSocketVM vm = event.owner;
+        var vm = event.owner;
         console.print("VM ${vm.target.networkAddress} renamed to '${vm.name}'");
         break;
 
       case S.ServiceEvent.kIsolateStart:
         {
           var iso = event.owner;
           console.print("Isolate ${iso.number} '${iso.name}' has been created");
         }
         break;
 
@@ skipping 1641 matching lines @@
   ..setAttribute('height', '24')
   ..children = [
     new PathElement()
       ..setAttribute(
           'd',
           'M11 17h2v-6h-2v6zm1-15C6.48 2 2 6.48 2 12s4.48 10 '
           '10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 '
           '0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zM11 '
           '9h2V7h-2v2z')
   ];