Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Khouzam2010-03-05 16:52:16 +0000
committerMarc Khouzam2010-03-05 16:52:16 +0000
commitadbac60c10dda2191674a13d20a7f5a0f97cf00c (patch)
tree9e2ba6eab9aaa143cc11e7bf12450a3684c88e96 /dsf/org.eclipse.cdt.dsf.ui
parentd2345dc960c66b8a2227c0111ebacc5c7baf6c67 (diff)
downloadorg.eclipse.cdt-adbac60c10dda2191674a13d20a7f5a0f97cf00c.tar.gz
org.eclipse.cdt-adbac60c10dda2191674a13d20a7f5a0f97cf00c.tar.xz
org.eclipse.cdt-adbac60c10dda2191674a13d20a7f5a0f97cf00c.zip
[303968] RunToLine and ResumeAtLine were overridden in GDBRunControl and GDBRunControl_7_ but this was mistakenly remove. Minor cleanup as well.
Diffstat (limited to 'dsf/org.eclipse.cdt.dsf.ui')
-rw-r--r--dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/ResumeAtLine.java11
-rw-r--r--dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RunToLine.java11
2 files changed, 8 insertions, 14 deletions
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/ResumeAtLine.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/ResumeAtLine.java
index 7e42df3c305..3d7fa080556 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/ResumeAtLine.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/ResumeAtLine.java
@@ -18,7 +18,6 @@ import org.eclipse.cdt.debug.core.model.IResumeAtAddress;
import org.eclipse.cdt.debug.core.model.IResumeAtLine;
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;
@@ -95,8 +94,7 @@ public class ResumeAtLine implements IResumeAtLine, IResumeAtAddress {
IRunControl2 runControl = tracker.getService(IRunControl2.class);
if (runControl != null) {
runControl.moveToLine(
- fContext, fileName, lineNumber, true,
- new DataRequestMonitor<Object>(ImmediateExecutor.getInstance(), rm));
+ fContext, fileName, lineNumber, true, rm);
} else {
rm.setStatus(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, IDsfStatusConstants.NOT_SUPPORTED, "IRunControl2 service not available", null)); //$NON-NLS-1$
rm.done();
@@ -114,7 +112,7 @@ public class ResumeAtLine implements IResumeAtLine, IResumeAtAddress {
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$
@@ -165,8 +163,7 @@ public class ResumeAtLine implements IResumeAtLine, IResumeAtAddress {
IRunControl2 runControl = tracker.getService(IRunControl2.class);
if (runControl != null) {
runControl.moveToAddress(
- fContext, address, true,
- new DataRequestMonitor<Object>(ImmediateExecutor.getInstance(), rm));
+ fContext, address, true, rm);
} else {
rm.setStatus(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, IDsfStatusConstants.NOT_SUPPORTED, "IRunControl2 service not available", null)); //$NON-NLS-1$
rm.done();
@@ -184,7 +181,7 @@ public class ResumeAtLine implements IResumeAtLine, IResumeAtAddress {
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 314bbbb1dac..e9fec4b7112 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
@@ -19,7 +19,6 @@ import org.eclipse.cdt.debug.core.model.IRunToAddress;
import org.eclipse.cdt.debug.core.model.IRunToLine;
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;
@@ -98,8 +97,7 @@ public class RunToLine implements IRunToLine, IRunToAddress {
IRunControl2 runControl = tracker.getService(IRunControl2.class);
if (runControl != null) {
runControl.runToLine(
- fContext, fileName, lineNumber, skipBreakpoints,
- new DataRequestMonitor<Object>(ImmediateExecutor.getInstance(), rm));
+ fContext, fileName, lineNumber, skipBreakpoints, rm);
} else {
rm.setStatus(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, IDsfStatusConstants.NOT_SUPPORTED, "IRunControl2 service not available", null)); //$NON-NLS-1$
rm.done();
@@ -117,7 +115,7 @@ public class RunToLine implements IRunToLine, IRunToAddress {
exception = e;
}
if (exception != null) {
- throw new DebugException(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, DebugException.REQUEST_FAILED, "Faild executing run to line", exception)); //$NON-NLS-1$
+ throw new DebugException(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, DebugException.REQUEST_FAILED, "Failed executing run 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$
@@ -167,8 +165,7 @@ public class RunToLine implements IRunToLine, IRunToAddress {
IRunControl2 runControl = tracker.getService(IRunControl2.class);
if (runControl != null) {
- runControl.runToAddress(fContext, address, skipBreakpoints,
- new DataRequestMonitor<Object>(ImmediateExecutor.getInstance(), rm));
+ runControl.runToAddress(fContext, address, skipBreakpoints, rm);
} else {
rm.setStatus(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, IDsfStatusConstants.NOT_SUPPORTED, "IRunControl2 service not available", null)); //$NON-NLS-1$
rm.done();
@@ -186,7 +183,7 @@ public class RunToLine implements IRunToLine, IRunToAddress {
exception = e;
}
if (exception != null) {
- throw new DebugException(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, DebugException.REQUEST_FAILED, "Faild executing run to line", exception)); //$NON-NLS-1$
+ throw new DebugException(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, DebugException.REQUEST_FAILED, "Failed executing run 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$

Back to the top