1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 18:26:01 +02:00

Fix compilation after commit for Bug 179293

This commit is contained in:
Marc Khouzam 2008-03-26 14:21:03 +00:00
parent fa8d487ab4
commit 2eeb644c2f
3 changed files with 9 additions and 8 deletions

View file

@ -253,11 +253,11 @@ public class PDABreakpoints extends AbstractDsfService implements IBreakpoints
} }
@Override @Override
protected void handleCancelOrErrorOrWarning() { protected void handleNotOK() {
// If inserting of the breakpoint failed, remove it from // If inserting of the breakpoint failed, remove it from
// the set of installed breakpoints. // the set of installed breakpoints.
fBreakpoints.remove(breakpointCtx); fBreakpoints.remove(breakpointCtx);
super.handleCancelOrErrorOrWarning(); super.handleNotOK();
} }
}); });
} }
@ -319,11 +319,11 @@ public class PDABreakpoints extends AbstractDsfService implements IBreakpoints
} }
@Override @Override
protected void handleCancelOrErrorOrWarning() { protected void handleNotOK() {
// Since the command failed, we need to remove the breakpoint from // Since the command failed, we need to remove the breakpoint from
// the existing breakpoint set. // the existing breakpoint set.
fBreakpoints.remove(watchpointCtx); fBreakpoints.remove(watchpointCtx);
super.handleCancelOrErrorOrWarning(); super.handleNotOK();
} }
}); });
} }

View file

@ -244,11 +244,11 @@ public class PDARunControl extends AbstractDsfService
new PDAResumeCommand(fCommandControl.getProgramDMContext()), new PDAResumeCommand(fCommandControl.getProgramDMContext()),
new DataRequestMonitor<PDACommandResult>(getExecutor(), rm) { new DataRequestMonitor<PDACommandResult>(getExecutor(), rm) {
@Override @Override
protected void handleCancelOrErrorOrWarning() { protected void handleNotOK() {
// If the resume command failed, we no longer // If the resume command failed, we no longer
// expect to receive a resumed event. // expect to receive a resumed event.
fResumePending = false; fResumePending = false;
super.handleCancelOrErrorOrWarning(); super.handleNotOK();
} }
} }
); );
@ -285,7 +285,7 @@ public class PDARunControl extends AbstractDsfService
new PDAStepCommand(fCommandControl.getProgramDMContext()), new PDAStepCommand(fCommandControl.getProgramDMContext()),
new DataRequestMonitor<PDACommandResult>(getExecutor(), rm) { new DataRequestMonitor<PDACommandResult>(getExecutor(), rm) {
@Override @Override
protected void handleCancelOrErrorOrWarning() { protected void handleNotOK() {
// If the step command failed, we no longer // If the step command failed, we no longer
// expect to receive a resumed event. // expect to receive a resumed event.
fResumePending = false; fResumePending = false;

View file

@ -10,6 +10,7 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.dd.gdb.internal.ui.viewmodel; package org.eclipse.dd.gdb.internal.ui.viewmodel;
import org.eclipse.cdt.debug.ui.ICDebugUIConstants;
import org.eclipse.dd.dsf.concurrent.ThreadSafe; import org.eclipse.dd.dsf.concurrent.ThreadSafe;
import org.eclipse.dd.dsf.debug.ui.viewmodel.expression.ExpressionVMProvider; import org.eclipse.dd.dsf.debug.ui.viewmodel.expression.ExpressionVMProvider;
import org.eclipse.dd.dsf.debug.ui.viewmodel.modules.ModulesVMProvider; import org.eclipse.dd.dsf.debug.ui.viewmodel.modules.ModulesVMProvider;
@ -51,7 +52,7 @@ public class GdbViewModelAdapter extends AbstractDMVMAdapter
return new RegisterVMProvider(this, context, getSession()); return new RegisterVMProvider(this, context, getSession());
} else if (IDebugUIConstants.ID_EXPRESSION_VIEW.equals(context.getId()) ) { } else if (IDebugUIConstants.ID_EXPRESSION_VIEW.equals(context.getId()) ) {
return new ExpressionVMProvider(this, context, getSession()); return new ExpressionVMProvider(this, context, getSession());
} else if (IDebugUIConstants.ID_MODULE_VIEW.equals(context.getId()) ) { } else if (ICDebugUIConstants.ID_MODULES_VIEW.equals(context.getId()) ) {
return new ModulesVMProvider(this, context, getSession()); return new ModulesVMProvider(this, context, getSession());
} }
return null; return null;