Version 1.5.0-dev.4.6

dart/editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/server/ServerDebugTarget.java

Index: dart/editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/server/ServerDebugTarget.java
===================================================================
--- dart/editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/server/ServerDebugTarget.java	(revision 37220)
+++ dart/editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/server/ServerDebugTarget.java	(working copy)
@@ -71,9 +71,7 @@
 
   private ServerBreakpointManager breakpointManager;
 
-  // TODO(devoncarew): this "main" isolate is temporary, until the VM allows us to 
-  // set wildcard breakpoints across all isolates.
-  private VmIsolate mainIsolate;
+  private VmIsolate currentIsolate;
 
   private IProject currentProject;
 
@@ -201,6 +199,8 @@
   @Override
   public void debuggerPaused(PausedReason reason, VmIsolate isolate, List<VmCallFrame> frames,
       VmValue exception) {
+    currentIsolate = isolate;
+
     boolean resumed = false;
 
     if (firstBreak) {
@@ -319,10 +319,6 @@
 
   @Override
   public void isolateCreated(VmIsolate isolate) {
-    if (mainIsolate == null) {
-      mainIsolate = isolate;
-    }
-
     addThread(new ServerDebugThread(this, isolate));
   }
 
@@ -408,9 +404,8 @@
     return getBreakpointFor(frame.getLocation());
   }
 
-  // TODO(devoncarew): the concept of a main isolate needs to go away
-  protected VmIsolate getMainIsolate() {
-    return mainIsolate;
+  protected VmIsolate getCurrentIsolate() {
+    return currentIsolate;
   }
 
   @Override