Add Breakpoint class to Observatory.

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:html';
 import 'observatory_element.dart';
 import 'package:observatory/cli.dart';
@@ skipping 235 matching lines @@
         return debugger.isolate.addBreakpoint(loc.script, loc.line).then((result) {
           if (result is DartError) {
             debugger.console.print('Unable to set breakpoint at ${loc}');
           } else {
             // TODO(turnidge): Adding a duplicate breakpoint is
             // currently ignored.  May want to change the protocol to
             // inform us when this happens.
 
             // The BreakpointResolved event prints resolved
             // breakpoints already.  Just print the unresolved ones here.
-            ServiceMap bpt = result;
-            if (!bpt['resolved']) {
-              var script = bpt['location']['script'];
-              var bpId = bpt['breakpointNumber'];
-              var tokenPos = bpt['location']['tokenPos'];
+            Breakpoint bpt = result;
+            if (!bpt.resolved) {
+              var script = bpt.script;
+              var bpId = bpt.number;
+              var tokenPos = bpt.tokenPos;
               return script.load().then((_) {
                 var line = script.tokenToLine(tokenPos);
                 var col = script.tokenToCol(tokenPos);
                 debugger.console.print(
                     'Future breakpoint ${bpId} added at '
                     '${script.name}:${line}:${col}');
               });
             }
           }
         });
@@ skipping 58 matching lines @@
           return null;
         }
         if (loc.col != null) {
           // TODO(turnidge): Add tokenPos clear support.
           debugger.console.print(
               'Ignoring column: '
               'clearing breakpoint at a specific column not yet implemented');
         }
 
         for (var bpt in debugger.isolate.breakpoints) {
-          var script = bpt['location']['script'];
+          var script = bpt.script;
           if (script.id == loc.script.id) {
             assert(script.loaded);
-            var line = script.tokenToLine(bpt['location']['tokenPos']);
+            var line = script.tokenToLine(bpt.tokenPos);
             if (line == loc.line) {
               return debugger.isolate.removeBreakpoint(bpt).then((result) {
                 if (result is DartError) {
                   debugger.console.print(
                       'Unable to clear breakpoint at ${loc}: ${result.message}');
                   return;
                 } else {
                   // TODO(turnidge): Add a BreakpointRemoved event to
                   // the service instead of printing here.
-                  var bpId = bpt['breakpointNumber'];
-                  debugger.console.print(
-                      'Breakpoint ${bpId} removed at ${loc}');
+                  var bpId = bpt.number;
+                  debugger.console.print('Breakpoint ${bpId} removed at ${loc}');
                   return;
                 }
               });
             }
           }
         }
         debugger.console.print('No breakpoint found at ${loc}');
       } else {
         debugger.console.print(loc.errorMessage);
       }
@@ skipping 38 matching lines @@
 
 // TODO(turnidge): Add argument completion.
 class DeleteCommand extends DebuggerCommand {
   DeleteCommand(Debugger debugger) : super(debugger, 'delete', []);
 
   Future run(List<String> args) {
     if (args.length < 1) {
       debugger.console.print('delete expects one or more arguments');
       return new Future.value(null);
     }
-    List toDelete = [];
+    List toRemove = [];
     for (var arg in args) {
       int id = int.parse(arg);
-      var bpt = null;
-      for (var candidate in debugger.isolate.breakpoints) {
-        if (candidate['breakpointNumber'] == id) {
-          bpt = candidate;
+      var bptToRemove = null;
+      for (var bpt in debugger.isolate.breakpoints) {
+        if (bpt.number == id) {
+          bptToRemove = bpt;
           break;
         }
       }
-      if (bpt == null) {
+      if (bptToRemove == null) {
         debugger.console.print("Invalid breakpoint id '${id}'");
         return new Future.value(null);
       }
-      toDelete.add(bpt);
+      toRemove.add(bptToRemove);
     }
     List pending = [];
-    for (var bpt in toDelete) {
+    for (var bpt in toRemove) {
       pending.add(debugger.isolate.removeBreakpoint(bpt).then((_) {
-            var id = bpt['breakpointNumber'];
+            var id = bpt.number;
             debugger.console.print("Removed breakpoint $id");
           }));
     }
     return Future.wait(pending);
   }
 
   String helpShort = 'Remove a breakpoint by breakpoint id';
 
   String helpLong =
       'Remove a breakpoint by breakpoint id.\n'
       '\n'
       'Syntax: delete <bp-id>\n'
       '        delete <bp-id> <bp-id> ...\n';
 }
 
 class InfoBreakpointsCommand extends DebuggerCommand {
   InfoBreakpointsCommand(Debugger debugger)
       : super(debugger, 'breakpoints', []);
 
   Future run(List<String> args) {
     return debugger.isolate.reloadBreakpoints().then((_) {
       if (debugger.isolate.breakpoints.isEmpty) {
         debugger.console.print('No breakpoints');
       }
       for (var bpt in debugger.isolate.breakpoints) {
-        var bpId = bpt['breakpointNumber'];
-        var script = bpt['location']['script'];
-        var tokenPos = bpt['location']['tokenPos'];
+        var bpId = bpt.number;
+        var script = bpt.script;
+        var tokenPos = bpt.tokenPos;
         var line = script.tokenToLine(tokenPos);
         var col = script.tokenToCol(tokenPos);
         var extras = new StringBuffer();
-        if (!bpt['resolved']) {
+        if (!bpt.resolved) {
           extras.write(' unresolved');
         }
-        if (!bpt['enabled']) {
+        if (!bpt.enabled) {
           extras.write(' disabled');
         }
         debugger.console.print(
             'Breakpoint ${bpId} at ${script.name}:${line}:${col}${extras}');
       }
     });
   }
 
   String helpShort = 'List all breakpoints';
 
@@ skipping 204 matching lines @@
       console.print(
           "Paused at isolate exit (type 'continue' to exit the isolate')");
     }
     if (stack['frames'].length > 0) {
       var frame = stack['frames'][0];
       var script = frame['script'];
       script.load().then((_) {
         var line = script.tokenToLine(frame['tokenPos']);
         var col = script.tokenToCol(frame['tokenPos']);
         if (event.breakpoint != null) {
-          var bpId = event.breakpoint['breakpointNumber'];
+          var bpId = event.breakpoint.number;
           console.print('Breakpoint ${bpId} at ${script.name}:${line}:${col}');
         } else if (event.exception != null) {
           // TODO(turnidge): Test this.
           console.print(
               'Exception ${event.exception} at ${script.name}:${line}:${col}');
         } else {
           console.print('Paused at ${script.name}:${line}:${col}');
         }
       });
     }
@@ skipping 15 matching lines @@
         _refreshStack(event).then((_) {
           _reportPause(event);
         });
         break;
 
       case 'IsolateResumed':
         console.print('Continuing...');
         break;
 
       case 'BreakpointResolved':
-        var bpId = event.breakpoint['breakpointNumber'];
-        var script = event.breakpoint['location']['script'];
-        var tokenPos = event.breakpoint['location']['tokenPos'];
+        var bpId = event.breakpoint.number;
+        var script = event.breakpoint.script;
+        var tokenPos = event.breakpoint.tokenPos;
         var line = script.tokenToLine(tokenPos);
         var col = script.tokenToCol(tokenPos);
         console.print(
             'Breakpoint ${bpId} added at ${script.name}:${line}:${col}');
         break;
 
       case '_Graph':
       case 'IsolateCreated':
       case 'GC':
         // Ignore these events for now.
@@ skipping 47 matching lines @@
   // TODO(turnidge): Implement real command line history.
   String lastCommand;
 
   Future run(String command) {
     if (command == '' && lastCommand != null) {
       command = lastCommand;
     }
     console.printBold('\$ $command');
     return cmd.runCommand(command).then((_) {
       lastCommand = command;
-    }).catchError((e) {
-      console.print('ERROR $e');
+    }).catchError((e, s) {
+      console.print('ERROR $e\n$s');
     });
   }
 }
 
 @CustomTag('debugger-page')
 class DebuggerPageElement extends ObservatoryElement {
   @published Isolate isolate;
 
   isolateChanged(oldValue) {
     if (isolate != null) {
@@ skipping 263 matching lines @@
               debugger.run(command).whenComplete(_notBusy);
             }
             break;
         }
       });
   }
 
   DebuggerInputElement.created() : super.created();
 }