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

 /*
  * Copyright (c) 2012, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
@@ skipping 53 matching lines @@
   private IProcess process;
 
   private VmConnection connection;
 
   private List<ServerDebugThread> threads = new ArrayList<ServerDebugThread>();
 
   private boolean firstBreak = true;
 
   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;
 
   public ServerDebugTarget(ILaunch launch, IProcess process, int connectionPort) {
     this(launch, process, null, connectionPort);
   }
 
   public ServerDebugTarget(ILaunch launch, IProcess process, String connectionHost,
       int connectionPort) {
     super(null);
@@ skipping 107 matching lines @@
     eclipseBpManager.addBreakpointManagerListener(this);
 
     if (!eclipseBpManager.isEnabled()) {
       setBreakpointsActive(false);
     }
   }
 
   @Override
   public void debuggerPaused(PausedReason reason, VmIsolate isolate, List<VmCallFrame> frames,
       VmValue exception) {
+    currentIsolate = isolate;
+
     boolean resumed = false;
 
     if (firstBreak) {
       firstBreak = false;
 
       // init everything
       firstIsolateInit(isolate);
 
       if (PausedReason.breakpoint == reason) {
         DartBreakpoint breakpoint = getBreakpointFor(frames);
@@ skipping 98 matching lines @@
     return !isTerminated();
   }
 
   @Override
   public boolean isDisconnected() {
     return process.isTerminated();
   }
 
   @Override
   public void isolateCreated(VmIsolate isolate) {
-    if (mainIsolate == null) {
-      mainIsolate = isolate;
-    }
-
     addThread(new ServerDebugThread(this, isolate));
   }
 
   @Override
   public void isolateShutdown(VmIsolate isolate) {
     removeThread(findThread(isolate));
   }
 
   @Override
   public boolean isSuspended() {
@@ skipping 65 matching lines @@
       return null;
     }
 
     return getBreakpointFor(frames.get(0));
   }
 
   protected DartBreakpoint getBreakpointFor(VmCallFrame frame) {
     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
   protected ServerDebugTarget getTarget() {
     return this;
   }
 
   private void addThread(ServerDebugThread thread) {
     threads.add(thread);
 
@@ skipping 120 matching lines @@
   }
 
   private void sleep(int millis) {
     try {
       Thread.sleep(millis);
     } catch (Exception exception) {
     }
   }
 
 }