More cleanup for bug 303968.

3 files changed, 8 insertions, 13 deletions

diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/SuspendResumeAdapterFactory.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/SuspendResumeAdapterFactory.java
index 1d686ff403d..ea1667c4c56 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/SuspendResumeAdapterFactory.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/SuspendResumeAdapterFactory.java
@@ -31,13 +31,13 @@ import org.eclipse.debug.core.model.ISuspendResume;
  */
 public class SuspendResumeAdapterFactory implements IAdapterFactory {
 
-    static class GdbSuspendResume implements ISuspendResume, IAdaptable {
+    static class SuspendResume implements ISuspendResume, IAdaptable {
 
         private final RunToLine fRunToLine;
         private final MoveToLine fMoveToLine;
         private final ResumeAtLine fResumeAtLine;
         
-        GdbSuspendResume(IExecutionDMContext execCtx) {
+        SuspendResume(IExecutionDMContext execCtx) {
             fRunToLine = new RunToLine(execCtx);
             fMoveToLine = new MoveToLine(execCtx);
             fResumeAtLine = new ResumeAtLine(execCtx);
@@ -77,7 +77,7 @@ public class SuspendResumeAdapterFactory implements IAdapterFactory {
             	// It only makes sense to RunToLine, MoveToLine or
                 // ResumeAtLine if we are dealing with a thread, not a container
                 if (execDmc != null && !(execDmc instanceof IContainerDMContext)) {
-                    return new GdbSuspendResume(execDmc);
+                    return new SuspendResume(execDmc);
                 }
             }
         }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/MoveToLine.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/MoveToLine.java
index 8228f91abf9..717291fdaa6 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/MoveToLine.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/MoveToLine.java
@@ -18,7 +18,6 @@ import org.eclipse.cdt.debug.core.model.IMoveToAddress;
 import org.eclipse.cdt.debug.core.model.IMoveToLine;
 import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor;
 import org.eclipse.cdt.dsf.concurrent.IDsfStatusConstants;
-import org.eclipse.cdt.dsf.concurrent.ImmediateExecutor;
 import org.eclipse.cdt.dsf.concurrent.Query;
 import org.eclipse.cdt.dsf.debug.service.IRunControl2;
 import org.eclipse.cdt.dsf.debug.service.IRunControl.IExecutionDMContext;
@@ -86,8 +85,7 @@ public class MoveToLine implements IMoveToLine, IMoveToAddress {
                         IRunControl2 runControl = tracker.getService(IRunControl2.class);
                         if (runControl != null) {
                         	runControl.moveToLine(
-                                fContext, fileName, lineNumber, false,
-                                new DataRequestMonitor<Object>(ImmediateExecutor.getInstance(), rm));
+                                fContext, fileName, lineNumber, false, rm);
                         } else {
                             rm.setStatus(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, IDsfStatusConstants.NOT_SUPPORTED, "IRunControl2 service not available", null)); //$NON-NLS-1$
                             rm.done();
@@ -105,7 +103,7 @@ public class MoveToLine implements IMoveToLine, IMoveToAddress {
                 exception = e;
             }
             if (exception != null) {
-                throw new DebugException(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, DebugException.REQUEST_FAILED, "Faild executing move to line", exception)); //$NON-NLS-1$
+                throw new DebugException(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, DebugException.REQUEST_FAILED, "Failed executing move to line", exception)); //$NON-NLS-1$
             }
         } else {
             throw new DebugException(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, DebugException.REQUEST_FAILED, "Debug session is not active", null)); //$NON-NLS-1$            
@@ -156,8 +154,7 @@ public class MoveToLine implements IMoveToLine, IMoveToAddress {
                         IRunControl2 runControl = tracker.getService(IRunControl2.class);
                         if (runControl != null) {
                         	runControl.moveToAddress(
-                                fContext, address, false,
-                                new DataRequestMonitor<Object>(ImmediateExecutor.getInstance(), rm));
+                                fContext, address, false, rm);
                         } else {
                             rm.setStatus(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, IDsfStatusConstants.NOT_SUPPORTED, "IRunControl2 service not available", null)); //$NON-NLS-1$
                             rm.done();
@@ -175,7 +172,7 @@ public class MoveToLine implements IMoveToLine, IMoveToAddress {
                 exception = e;
             }
             if (exception != null) {
-                throw new DebugException(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, DebugException.REQUEST_FAILED, "Faild executing move to line", exception)); //$NON-NLS-1$
+                throw new DebugException(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, DebugException.REQUEST_FAILED, "Failed executing move to line", exception)); //$NON-NLS-1$
             }
         } else {
             throw new DebugException(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, DebugException.REQUEST_FAILED, "Debug session is not active", null)); //$NON-NLS-1$            
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RunToLine.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RunToLine.java
index fbaf2d9e43d..314bbbb1dac 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RunToLine.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RunToLine.java
@@ -36,7 +36,7 @@ import org.eclipse.debug.ui.actions.IRunToLineTarget;
  * Implements the CDT's run to line interface.  This interface is called by CDT's
  * {@link IRunToLineTarget} implementation.
  * 
- * @since 2.0
+ * @since 2.1
  */
 public class RunToLine implements IRunToLine, IRunToAddress {
 
@@ -124,7 +124,6 @@ public class RunToLine implements IRunToLine, IRunToAddress {
         }
     }
     
-    /** @since 2.1 */
 	public boolean canRunToAddress(final IAddress address) {
         DsfSession session = DsfSession.getSession(fContext.getSessionId());
         if (session != null && session.isActive()) {
@@ -155,7 +154,6 @@ public class RunToLine implements IRunToLine, IRunToAddress {
         return false;
     }
 
-    /** @since 2.1 */
 	public void runToAddress(final IAddress address, final boolean skipBreakpoints) throws DebugException {
         DsfSession session = DsfSession.getSession(fContext.getSessionId());
         if (session != null && session.isActive()) {