From ea9ca832e059fefefdf08bdbd1550e2574eef694 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Sun, 7 Apr 2013 22:02:44 -0400 Subject: [PATCH] Bug 405120 - Reverse run-control operation still enabled during trace visualization Change-Id: I28a127b7ba2ce94eec30025a4bee925c99b494a5 Reviewed-on: https://git.eclipse.org/r/11709 Reviewed-by: Marc Khouzam IP-Clean: Marc Khouzam Tested-by: Marc Khouzam --- .../dsf/gdb/service/GDBRunControl_7_0.java | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0.java index f5f8f1b8055..10ff2c2ee25 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0.java @@ -207,7 +207,7 @@ public class GDBRunControl_7_0 extends MIRunControl implements IReverseRunContro */ @Override public void canResume(IExecutionDMContext context, DataRequestMonitor rm) { - if (fRunControlOperationsEnabled == false) { + if (!fRunControlOperationsEnabled) { rm.setData(false); rm.done(); return; @@ -220,7 +220,7 @@ public class GDBRunControl_7_0 extends MIRunControl implements IReverseRunContro */ @Override public void canSuspend(IExecutionDMContext context, DataRequestMonitor rm) { - if (fRunControlOperationsEnabled == false) { + if (!fRunControlOperationsEnabled) { rm.setData(false); rm.done(); return; @@ -233,7 +233,7 @@ public class GDBRunControl_7_0 extends MIRunControl implements IReverseRunContro */ @Override public void canStep(final IExecutionDMContext context, StepType stepType, final DataRequestMonitor rm) { - if (fRunControlOperationsEnabled == false) { + if (!fRunControlOperationsEnabled) { rm.setData(false); rm.done(); return; @@ -273,6 +273,12 @@ public class GDBRunControl_7_0 extends MIRunControl implements IReverseRunContro /** @since 2.0 */ @Override public void canReverseResume(IExecutionDMContext context, DataRequestMonitor rm) { + if (!fRunControlOperationsEnabled) { + rm.setData(false); + rm.done(); + return; + } + rm.setData(fReverseModeEnabled && doCanResume(context)); rm.done(); } @@ -280,7 +286,13 @@ public class GDBRunControl_7_0 extends MIRunControl implements IReverseRunContro /** @since 2.0 */ @Override public void canReverseStep(final IExecutionDMContext context, StepType stepType, final DataRequestMonitor rm) { - if (context instanceof IContainerDMContext) { + if (!fRunControlOperationsEnabled) { + rm.setData(false); + rm.done(); + return; + } + + if (context instanceof IContainerDMContext) { rm.setData(false); rm.done(); return;