From 29521b9edcded90c54bb9b026bc656e819e8e364 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Sat, 28 Feb 2009 16:05:41 +0000 Subject: [PATCH] [266588] Cleanup of Deprecated things as we are going to 2.0 --- .../cdt/dsf/mi/service/MIBreakpoints.java | 11 ---- .../dsf/mi/service/MIBreakpointsManager.java | 13 ---- .../cdt/dsf/mi/service/MIRunControl.java | 11 ---- .../service/command/AbstractCLIProcess.java | 10 +-- .../mi/service/command/CLIEventProcessor.java | 11 +--- .../mi/service/command/MIInferiorProcess.java | 66 +------------------ .../command/MIRunControlEventProcessor.java | 9 +-- .../command/commands/CLIExecAbort.java | 8 +-- .../service/command/commands/CLISource.java | 8 +-- .../commands/MIDataEvaluateExpression.java | 9 +-- .../commands/MIFileExecAndSymbols.java | 15 +---- .../command/commands/MIFileExecFile.java | 13 +--- .../command/commands/MIFileSymbolFile.java | 13 +--- .../command/commands/MIGDBSetAutoSolib.java | 8 +-- .../commands/MIGDBSetSolibSearchPath.java | 8 +-- .../command/commands/MIGDBShowExitCode.java | 8 +-- .../command/commands/MIInferiorTTYSet.java | 8 +-- .../command/commands/MITargetSelect.java | 12 +--- .../service/command/commands/MIVarAssign.java | 7 +- .../service/command/commands/MIVarDelete.java | 8 +-- .../commands/MIVarEvaluateExpression.java | 8 +-- .../command/commands/MIVarInfoExpression.java | 8 +-- .../commands/MIVarInfoPathExpression.java | 10 +-- .../command/commands/MIVarInfoType.java | 8 +-- .../command/commands/MIVarListChildren.java | 8 +-- .../command/commands/MIVarSetFormat.java | 8 +-- .../command/commands/MIVarShowAttributes.java | 8 +-- .../command/commands/MIVarShowFormat.java | 8 +-- .../service/command/commands/MIVarUpdate.java | 8 +-- .../command/events/MIBreakpointHitEvent.java | 29 +------- .../command/events/MIDetachedEvent.java | 8 +-- .../events/MIFunctionFinishedEvent.java | 33 +--------- .../command/events/MIGDBExitEvent.java | 42 ------------ .../command/events/MIInferiorExitEvent.java | 13 +--- .../events/MIInferiorSignalExitEvent.java | 13 +--- .../events/MILocationReachedEvent.java | 12 +--- .../command/events/MISharedLibEvent.java | 13 +--- .../service/command/events/MISignalEvent.java | 31 +-------- .../command/events/MISteppingRangeEvent.java | 14 +--- .../command/events/MIStoppedEvent.java | 37 +---------- .../events/MIWatchpointScopeEvent.java | 28 +------- .../events/MIWatchpointTriggerEvent.java | 64 +----------------- .../output/CLIMonitorListProcessesInfo.java | 2 +- 43 files changed, 42 insertions(+), 627 deletions(-) delete mode 100644 dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIGDBExitEvent.java diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java index d66c297a3d2..83ecf232d62 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpoints.java @@ -35,7 +35,6 @@ import org.eclipse.cdt.dsf.mi.service.command.commands.MIBreakEnable; import org.eclipse.cdt.dsf.mi.service.command.commands.MIBreakInsert; import org.eclipse.cdt.dsf.mi.service.command.commands.MIBreakList; import org.eclipse.cdt.dsf.mi.service.command.commands.MIBreakWatch; -import org.eclipse.cdt.dsf.mi.service.command.events.MIGDBExitEvent; import org.eclipse.cdt.dsf.mi.service.command.events.MIWatchpointScopeEvent; import org.eclipse.cdt.dsf.mi.service.command.output.MIBreakInsertInfo; import org.eclipse.cdt.dsf.mi.service.command.output.MIBreakListInfo; @@ -273,16 +272,6 @@ public class MIBreakpoints extends AbstractDsfService implements IBreakpoints } } - /** - * This method is left for API compatibility only. - * ICommandControlShutdownDMEvent is used instead - * @nooverride This method is not intended to be re-implemented or extended by clients. - * @noreference This method is not intended to be referenced by clients. - */ - @DsfServiceEventHandler - public void eventDispatched(MIGDBExitEvent e) { - } - /** * @since 1.1 * @nooverride This method is not intended to be re-implemented or extended by clients. diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java index d87f4192c4a..7ce4fc152ef 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java @@ -59,7 +59,6 @@ import org.eclipse.cdt.dsf.mi.service.MIBreakpoints.MIBreakpointDMContext; import org.eclipse.cdt.dsf.mi.service.MIRunControl.SuspendedEvent; import org.eclipse.cdt.dsf.mi.service.breakpoint.actions.BreakpointActionAdapter; import org.eclipse.cdt.dsf.mi.service.command.events.MIBreakpointHitEvent; -import org.eclipse.cdt.dsf.mi.service.command.events.MIGDBExitEvent; import org.eclipse.cdt.dsf.mi.service.command.events.MIWatchpointScopeEvent; import org.eclipse.cdt.dsf.mi.service.command.events.MIWatchpointTriggerEvent; import org.eclipse.cdt.dsf.service.AbstractDsfService; @@ -1259,18 +1258,6 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo // Session exit //------------------------------------------------------------------------- - // Not used, kept for API compatibility. - /** - * This method is left for API compatibility only. - * ICommandControlShutdownDMEvent is used instead. - * @nooverride This method is not intended to be re-implemented or extended by clients. - * @noreference This method is not intended to be referenced by clients. - */ - @DsfServiceEventHandler - public void eventDispatched(MIGDBExitEvent e) { - terminated(); - } - /** * @since 1.1 * @nooverride This method is not intended to be re-implemented or extended by clients. diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java index 88f0c940109..db8c1b74af4 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java @@ -40,7 +40,6 @@ import org.eclipse.cdt.dsf.mi.service.command.events.IMIDMEvent; import org.eclipse.cdt.dsf.mi.service.command.events.MIBreakpointHitEvent; import org.eclipse.cdt.dsf.mi.service.command.events.MIErrorEvent; import org.eclipse.cdt.dsf.mi.service.command.events.MIEvent; -import org.eclipse.cdt.dsf.mi.service.command.events.MIGDBExitEvent; import org.eclipse.cdt.dsf.mi.service.command.events.MIRunningEvent; import org.eclipse.cdt.dsf.mi.service.command.events.MISharedLibEvent; import org.eclipse.cdt.dsf.mi.service.command.events.MISignalEvent; @@ -430,16 +429,6 @@ public class MIRunControl extends AbstractDsfService implements IRunControl, ICa fStepping = false; } - /** - * Not used, kept for API compatibility. ICommandControlShutdownDMEvent is used instead - * @nooverride This method is not intended to be re-implemented or extended by clients. - * @noreference This method is not intended to be referenced by clients. - */ - @DsfServiceEventHandler - public void eventDispatched(MIGDBExitEvent e) { - fTerminated = true; - } - /** * @nooverride This method is not intended to be re-implemented or extended by clients. * @noreference This method is not intended to be referenced by clients. diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractCLIProcess.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractCLIProcess.java index b7fad0c5dd4..9d633647a27 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractCLIProcess.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/AbstractCLIProcess.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -122,16 +122,8 @@ public abstract class AbstractCLIProcess extends Process fMIInLogPipe = miInLogPipe; } - @Deprecated - public AbstractCLIProcess(AbstractMIControl commandControl) throws IOException { - this ( (ICommandControlService)commandControl ); - } - protected DsfSession getSession() { return fSession; } - @Deprecated - protected AbstractMIControl getCommandControl() { return (AbstractMIControl)fCommandControl; } - /** * @since 1.1 */ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/CLIEventProcessor.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/CLIEventProcessor.java index 974ff4ca90c..60e77d41096 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/CLIEventProcessor.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/CLIEventProcessor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -73,20 +73,11 @@ public class CLIEventProcessor fLastThreadId = 0; } - @Deprecated - public CLIEventProcessor(AbstractMIControl connection, IContainerDMContext containerDmc, MIInferiorProcess inferior) { - this(connection, DMContexts.getAncestorOfType(containerDmc, ICommandControlDMContext.class)); - } - public void dispose() { fCommandControl.removeCommandListener(this); fCommandControl.removeEventListener(this); fServicesTracker.dispose(); } - - @Deprecated - public void resetInferior(MIInferiorProcess inferior) { - } public void commandSent(ICommandToken token) { if (token.getCommand() instanceof CLICommand) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIInferiorProcess.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIInferiorProcess.java index 6a7e99bebe9..469b3bceb8f 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIInferiorProcess.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIInferiorProcess.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -28,11 +28,8 @@ import org.eclipse.cdt.dsf.concurrent.DsfRunnable; 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.datamodel.AbstractDMEvent; import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerDMContext; import org.eclipse.cdt.dsf.debug.service.IRunControl.IExecutionDMContext; -import org.eclipse.cdt.dsf.debug.service.IRunControl.IExitedDMEvent; -import org.eclipse.cdt.dsf.debug.service.IRunControl.IStartedDMEvent; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService; import org.eclipse.cdt.dsf.debug.service.command.ICommandListener; import org.eclipse.cdt.dsf.debug.service.command.ICommandResult; @@ -70,34 +67,6 @@ public class MIInferiorProcess extends Process implements IEventListener, ICommandListener { - /** - * Event indicating that the GDB inferior process has started. This event - * implements the {@link IStartedDMEvent} from the IRunControl service. - * @deprecated - */ - @Deprecated - public static class InferiorStartedDMEvent extends AbstractDMEvent - implements IStartedDMEvent - { - public InferiorStartedDMEvent(IExecutionDMContext context) { - super(context); - } - } - - /** - * Event indicating that the GDB inferior process has exited. This event - * implements the {@link IExitedDMEvent} from the IRunControl service. - * @deprecated - */ - @Deprecated - public static class InferiorExitedDMEvent extends AbstractDMEvent - implements IExitedDMEvent - { - public InferiorExitedDMEvent(IExecutionDMContext context) { - super(context); - } - } - public enum State { RUNNING, STOPPED, TERMINATED } private final OutputStream fOutputStream; @@ -153,21 +122,6 @@ public class MIInferiorProcess extends Process this(commandControl, gdbOutputStream, null); } - @Deprecated - public MIInferiorProcess(AbstractMIControl commandControl, IExecutionDMContext inferiorExecCtx, OutputStream gdbOutputStream) { - this(commandControl, gdbOutputStream, null); - } - - /** - * @deprecated {@link #MIInferiorProcess(ICommandControlService, IExecutionDMContext, OutputStream)} - * should be used instead. - */ - @ConfinedToDsfExecutor("fSession#getExecutor") - @Deprecated - public MIInferiorProcess(AbstractMIControl commandControl, OutputStream gdbOutputStream) { - this(commandControl, gdbOutputStream, null); - } - /** * Creates an inferior process object which uses the given terminal * to write the user standard input into. @@ -183,21 +137,6 @@ public class MIInferiorProcess extends Process this(commandControl, null, p); } - @Deprecated - public MIInferiorProcess(AbstractMIControl commandControl, IExecutionDMContext inferiorExecCtx, PTY p) { - this(commandControl, (OutputStream)null, p); - } - - /** - * @deprecated Should use {@link #MIInferiorProcess(ICommandControlService, IExecutionDMContext, PTY)} - * instead. - */ - @ConfinedToDsfExecutor("fSession#getExecutor") - @Deprecated - public MIInferiorProcess(AbstractMIControl commandControl, PTY p) { - this(commandControl, (OutputStream)null, p); - } - @ConfinedToDsfExecutor("fSession#getExecutor") private MIInferiorProcess(ICommandControlService commandControl, final OutputStream gdbOutputStream, PTY p) { fCommandControl = commandControl; @@ -262,9 +201,6 @@ public class MIInferiorProcess extends Process return fSession; } - @Deprecated - protected AbstractMIControl getCommandControl() { return (AbstractMIControl)fCommandControl; } - /** * @since 1.1 */ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor.java index caa2f6fa7f5..b4f3f0703d5 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/MIRunControlEventProcessor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2008 Wind River Systems and others. + * Copyright (c) 2009 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,7 +14,6 @@ package org.eclipse.cdt.dsf.mi.service.command; import java.util.LinkedList; import java.util.List; -import org.eclipse.cdt.dsf.datamodel.DMContexts; import org.eclipse.cdt.dsf.debug.service.IProcesses.IProcessDMContext; import org.eclipse.cdt.dsf.debug.service.IProcesses.IThreadDMContext; import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerDMContext; @@ -96,12 +95,6 @@ public class MIRunControlEventProcessor connection.addCommandListener(this); } - @Deprecated - public MIRunControlEventProcessor(AbstractMIControl connection, IContainerDMContext containerDmc) { - this(connection, DMContexts.getAncestorOfType(containerDmc, ICommandControlDMContext.class)); - - } - /** * This processor must be disposed before the control service is un-registered. */ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIExecAbort.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIExecAbort.java index e16d8d4ef63..ffc892d9168 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIExecAbort.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLIExecAbort.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,6 @@ package org.eclipse.cdt.dsf.mi.service.command.commands; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; -import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext; import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo; /** @@ -31,9 +30,4 @@ public class CLIExecAbort extends CLICommand public CLIExecAbort(ICommandControlDMContext ctx) { super(ctx, "kill"); //$NON-NLS-1$ } - - @Deprecated - public CLIExecAbort(MIControlDMContext ctx) { - this ((ICommandControlDMContext)ctx); - } } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLISource.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLISource.java index 0eb5f5493f5..df15a63d621 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLISource.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/CLISource.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 Ericsson and others. + * Copyright (c) 2009 Ericsson and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,7 +11,6 @@ package org.eclipse.cdt.dsf.mi.service.command.commands; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; -import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext; import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo; /** @@ -28,9 +27,4 @@ public class CLISource extends CLICommand { public CLISource(ICommandControlDMContext ctx, String file) { super(ctx, "source " + file); //$NON-NLS-1$ } - - @Deprecated - public CLISource(MIControlDMContext ctx, String file) { - this ((ICommandControlDMContext)ctx, file); - } } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIDataEvaluateExpression.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIDataEvaluateExpression.java index a0c27e67341..8f3f2a12866 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIDataEvaluateExpression.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIDataEvaluateExpression.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -16,7 +16,6 @@ import org.eclipse.cdt.dsf.debug.service.IExpressions.IExpressionDMContext; import org.eclipse.cdt.dsf.debug.service.IStack.IFrameDMContext; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; import org.eclipse.cdt.dsf.mi.service.IMIExecutionDMContext; -import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext; import org.eclipse.cdt.dsf.mi.service.command.output.MIDataEvaluateExpressionInfo; import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput; @@ -38,12 +37,6 @@ public class MIDataEvaluateExpression ex super(ctx, "-data-evaluate-expression", new String[]{expr}); //$NON-NLS-1$ } - @Deprecated - public MIDataEvaluateExpression(MIControlDMContext ctx, String expr) { - this ((ICommandControlDMContext)ctx, expr); - } - - public MIDataEvaluateExpression(IMIExecutionDMContext execDmc, String expr) { super(execDmc, "-data-evaluate-expression", new String[]{expr}); //$NON-NLS-1$ } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIFileExecAndSymbols.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIFileExecAndSymbols.java index d81075a0aa4..455d376b958 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIFileExecAndSymbols.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIFileExecAndSymbols.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 Ericsson and others. + * Copyright (c) 2009 Ericsson and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,7 +12,6 @@ package org.eclipse.cdt.dsf.mi.service.command.commands; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; -import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext; import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo; @@ -32,21 +31,11 @@ public class MIFileExecAndSymbols extends MICommand public MIFileExecAndSymbols(ICommandControlDMContext dmc, String file) { super(dmc, "-file-exec-and-symbols", null, new String[] {file}); //$NON-NLS-1$ } - - @Deprecated - public MIFileExecAndSymbols(MIControlDMContext dmc, String file) { - this ((ICommandControlDMContext)dmc, file); - } - + /** * @since 1.1 */ public MIFileExecAndSymbols(ICommandControlDMContext dmc) { super(dmc, "-file-exec-and-symbols"); //$NON-NLS-1$ } - - @Deprecated - public MIFileExecAndSymbols(MIControlDMContext dmc) { - this ((ICommandControlDMContext)dmc); - } } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIFileExecFile.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIFileExecFile.java index fa8afbae943..af1f7177abb 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIFileExecFile.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIFileExecFile.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,6 @@ package org.eclipse.cdt.dsf.mi.service.command.commands; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; -import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext; import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo; @@ -34,20 +33,10 @@ public class MIFileExecFile extends MICommand super(dmc, "-file-exec-file", null, new String[] {file}); //$NON-NLS-1$ } - @Deprecated - public MIFileExecFile(MIControlDMContext dmc, String file) { - this ((ICommandControlDMContext)dmc, file); - } - /** * @since 1.1 */ public MIFileExecFile(ICommandControlDMContext dmc) { super(dmc, "-file-exec-file"); //$NON-NLS-1$ } - - @Deprecated - public MIFileExecFile(MIControlDMContext dmc) { - this ((ICommandControlDMContext)dmc); - } } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIFileSymbolFile.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIFileSymbolFile.java index 135520233f5..6361bf4c342 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIFileSymbolFile.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIFileSymbolFile.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,6 @@ package org.eclipse.cdt.dsf.mi.service.command.commands; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; -import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext; import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo; @@ -32,11 +31,6 @@ public class MIFileSymbolFile extends MICommand public MIFileSymbolFile(ICommandControlDMContext dmc, String file) { super(dmc, "-file-symbol-file", null, new String[] {file}); //$NON-NLS-1$ } - - @Deprecated - public MIFileSymbolFile(MIControlDMContext dmc, String file) { - this ((ICommandControlDMContext)dmc, file); - } /** * @since 1.1 @@ -44,9 +38,4 @@ public class MIFileSymbolFile extends MICommand public MIFileSymbolFile(ICommandControlDMContext dmc) { super(dmc, "-file-symbol-file"); //$NON-NLS-1$ } - - @Deprecated - public MIFileSymbolFile(MIControlDMContext dmc) { - this ((ICommandControlDMContext)dmc); - } } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetAutoSolib.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetAutoSolib.java index 51991c99738..4f400b931c6 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetAutoSolib.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetAutoSolib.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,7 +11,6 @@ package org.eclipse.cdt.dsf.mi.service.command.commands; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; -import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext; /** * @@ -26,9 +25,4 @@ public class MIGDBSetAutoSolib extends MIGDBSet public MIGDBSetAutoSolib(ICommandControlDMContext ctx, boolean isSet) { super(ctx, new String[] {"auto-solib-add", isSet ? "on" : "off"});//$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ } - - @Deprecated - public MIGDBSetAutoSolib(MIControlDMContext ctx, boolean isSet) { - this ((ICommandControlDMContext)ctx, isSet); - } } \ No newline at end of file diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetSolibSearchPath.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetSolibSearchPath.java index 76eaba243cc..6f2766dd4fa 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetSolibSearchPath.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetSolibSearchPath.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 Ericsson and others. + * Copyright (c) 2009 Ericsson and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -11,7 +11,6 @@ package org.eclipse.cdt.dsf.mi.service.command.commands; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; -import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext; /** * @@ -38,9 +37,4 @@ public class MIGDBSetSolibSearchPath extends MIGDBSet String[] p = new String [] {"solib-search-path", buffer.toString()}; //$NON-NLS-1$ setParameters(p); } - - @Deprecated - public MIGDBSetSolibSearchPath(MIControlDMContext ctx, String[] paths) { - this ((ICommandControlDMContext)ctx, paths); - } } \ No newline at end of file diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBShowExitCode.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBShowExitCode.java index b4a11344406..7c7efac62b9 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBShowExitCode.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBShowExitCode.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,6 @@ package org.eclipse.cdt.dsf.mi.service.command.commands; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; -import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext; import org.eclipse.cdt.dsf.mi.service.command.output.MIGDBShowExitCodeInfo; import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput; @@ -34,11 +33,6 @@ public class MIGDBShowExitCode extends MIDataEvaluateExpression public MIInferiorTTYSet(ICommandControlDMContext dmc, String tty) { super(dmc, "-inferior-tty-set", null, new String[] {tty}); //$NON-NLS-1$ } - - @Deprecated - public MIInferiorTTYSet(MIControlDMContext dmc, String tty) { - this ((ICommandControlDMContext)dmc, tty); - } } \ No newline at end of file diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITargetSelect.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITargetSelect.java index feac6f217b3..3e96ad3c138 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITargetSelect.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MITargetSelect.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 Ericsson and others. + * Copyright (c) 2009 Ericsson and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -18,16 +18,6 @@ import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo; */ public class MITargetSelect extends MICommand { - @Deprecated - public MITargetSelect(IDMContext ctx, String host, String port) { - this(ctx, host, port, true); - } - - @Deprecated - public MITargetSelect(IDMContext ctx, String serialDevice) { - this(ctx, serialDevice, true); - } - /** * @since 1.1 */ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarAssign.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarAssign.java index f9168847112..f6f36e19fe2 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarAssign.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarAssign.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,7 +12,6 @@ package org.eclipse.cdt.dsf.mi.service.command.commands; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; -import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext; import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput; import org.eclipse.cdt.dsf.mi.service.command.output.MIVarAssignInfo; @@ -33,10 +32,6 @@ public class MIVarAssign extends MICommand super(ctx, "-var-assign", new String[]{name, expression}); //$NON-NLS-1$ } - @Deprecated - public MIVarAssign(MIControlDMContext ctx, String name, String expression) { - this ((ICommandControlDMContext)ctx, name, expression); - } @Override public MIVarAssignInfo getResult(MIOutput out) { return new MIVarAssignInfo(out); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarDelete.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarDelete.java index 6fbcbefab19..ed032d9481a 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarDelete.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarDelete.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,6 @@ package org.eclipse.cdt.dsf.mi.service.command.commands; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; -import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext; import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput; import org.eclipse.cdt.dsf.mi.service.command.output.MIVarDeleteInfo; @@ -35,11 +34,6 @@ public class MIVarDelete extends MICommand super(dmc, "-var-delete", new String[]{name}); //$NON-NLS-1$ } - @Deprecated - public MIVarDelete(MIControlDMContext dmc, String name) { - this ((ICommandControlDMContext)dmc, name); - } - @Override public MIVarDeleteInfo getResult(MIOutput out) { return new MIVarDeleteInfo(out); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarEvaluateExpression.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarEvaluateExpression.java index afb16f60e20..a56caf60af4 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarEvaluateExpression.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarEvaluateExpression.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,7 +14,6 @@ package org.eclipse.cdt.dsf.mi.service.command.commands; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; -import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext; import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput; import org.eclipse.cdt.dsf.mi.service.command.output.MIVarEvaluateExpressionInfo; @@ -38,11 +37,6 @@ public class MIVarEvaluateExpression extends MICommand public MIVarInfoExpression(ICommandControlDMContext ctx, String name) { super(ctx, "-var-info-expression", new String[]{name}); //$NON-NLS-1$ } - - @Deprecated - public MIVarInfoExpression(MIControlDMContext ctx, String name) { - this ((ICommandControlDMContext)ctx, name); - } @Override public MIVarInfoExpressionInfo getResult(MIOutput out) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarInfoPathExpression.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarInfoPathExpression.java index 453f1095f19..62ea8a37140 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarInfoPathExpression.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarInfoPathExpression.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Ericsson and others. + * Copyright (c) 2009 Ericsson and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,7 +12,6 @@ package org.eclipse.cdt.dsf.mi.service.command.commands; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; -import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext; import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput; import org.eclipse.cdt.dsf.mi.service.command.output.MIVarInfoPathExpressionInfo; @@ -37,12 +36,7 @@ public class MIVarInfoPathExpression extends MICommand super(ctx, "-var-info-type", new String[]{name}); //$NON-NLS-1$ } - @Deprecated - public MIVarInfoType(MIControlDMContext ctx, String name) { - this ((ICommandControlDMContext)ctx, name); - } - @Override public MIVarInfoTypeInfo getResult(MIOutput out) { return new MIVarInfoTypeInfo(out); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarListChildren.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarListChildren.java index 194b42299eb..fda2ffb856e 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarListChildren.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarListChildren.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,7 +14,6 @@ package org.eclipse.cdt.dsf.mi.service.command.commands; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; -import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext; import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput; import org.eclipse.cdt.dsf.mi.service.command.output.MIVarListChildrenInfo; @@ -36,11 +35,6 @@ public class MIVarListChildren extends MICommand public MIVarListChildren(ICommandControlDMContext ctx, String name) { super(ctx, "-var-list-children", new String[]{name}); //$NON-NLS-1$ } - - @Deprecated - public MIVarListChildren(MIControlDMContext ctx, String name) { - this ((ICommandControlDMContext)ctx, name); - } @Override public MIVarListChildrenInfo getResult(MIOutput out) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarSetFormat.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarSetFormat.java index 3eff20a43b9..d0143498480 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarSetFormat.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarSetFormat.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -15,7 +15,6 @@ package org.eclipse.cdt.dsf.mi.service.command.commands; import org.eclipse.cdt.dsf.debug.service.IFormattedValues; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; -import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext; import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput; import org.eclipse.cdt.dsf.mi.service.command.output.MIVarSetFormatInfo; @@ -42,11 +41,6 @@ public class MIVarSetFormat extends MICommand setParameters(new String[]{name, getFormat(fmt)}); } - @Deprecated - public MIVarSetFormat(MIControlDMContext ctx, String name, String fmt) { - this ((ICommandControlDMContext)ctx, name, fmt); - } - private String getFormat(String fmt){ String format = "natural"; //$NON-NLS-1$ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarShowAttributes.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarShowAttributes.java index 7bc5c0703de..31b650b5264 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarShowAttributes.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarShowAttributes.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,7 +12,6 @@ package org.eclipse.cdt.dsf.mi.service.command.commands; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; -import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext; import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput; import org.eclipse.cdt.dsf.mi.service.command.output.MIVarShowAttributesInfo; @@ -37,11 +36,6 @@ public class MIVarShowAttributes extends MICommand public MIVarShowAttributes(ICommandControlDMContext ctx, String name) { super(ctx, "-var-show-attributes", new String[]{name}); //$NON-NLS-1$ } - - @Deprecated - public MIVarShowAttributes(MIControlDMContext ctx, String name) { - this ((ICommandControlDMContext)ctx, name); - } @Override public MIVarShowAttributesInfo getResult(MIOutput out) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarShowFormat.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarShowFormat.java index 4afc4672eff..d4425b7f445 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarShowFormat.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarShowFormat.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,7 +12,6 @@ package org.eclipse.cdt.dsf.mi.service.command.commands; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; -import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext; import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput; import org.eclipse.cdt.dsf.mi.service.command.output.MIVarShowFormatInfo; @@ -34,11 +33,6 @@ public class MIVarShowFormat extends MICommand public MIVarShowFormat(ICommandControlDMContext ctx, String name) { super(ctx, "-var-show-format", new String[]{name}); //$NON-NLS-1$ } - - @Deprecated - public MIVarShowFormat(MIControlDMContext ctx, String name) { - this ((ICommandControlDMContext)ctx, name); - } @Override public MIVarShowFormatInfo getResult(MIOutput out) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarUpdate.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarUpdate.java index 4176085c434..535381a92f6 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarUpdate.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarUpdate.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,7 +14,6 @@ package org.eclipse.cdt.dsf.mi.service.command.commands; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; -import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext; import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput; import org.eclipse.cdt.dsf.mi.service.command.output.MIVarUpdateInfo; @@ -38,11 +37,6 @@ public class MIVarUpdate extends MICommand { public MIVarUpdate(ICommandControlDMContext dmc, String name) { super(dmc, "-var-update", new String[] { "1", name }); //$NON-NLS-1$//$NON-NLS-2$ } - - @Deprecated - public MIVarUpdate(MIControlDMContext ctx, String name) { - this ((ICommandControlDMContext)ctx, name); - } @Override public MIVarUpdateInfo getResult(MIOutput out) { diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIBreakpointHitEvent.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIBreakpointHitEvent.java index a215920b33e..d82d6dfc75c 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIBreakpointHitEvent.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIBreakpointHitEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,9 +13,7 @@ package org.eclipse.cdt.dsf.mi.service.command.events; import org.eclipse.cdt.dsf.concurrent.Immutable; -import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerDMContext; import org.eclipse.cdt.dsf.debug.service.IRunControl.IExecutionDMContext; -import org.eclipse.cdt.dsf.mi.service.MIRunControl; import org.eclipse.cdt.dsf.mi.service.command.output.MIConst; import org.eclipse.cdt.dsf.mi.service.command.output.MIFrame; import org.eclipse.cdt.dsf.mi.service.command.output.MIResult; @@ -38,31 +36,6 @@ public class MIBreakpointHitEvent extends MIStoppedEvent { public int getNumber() { return bkptno; } - - @Deprecated - public static MIBreakpointHitEvent parse( - MIRunControl runControl, IContainerDMContext containerDmc, int token, MIResult[] results) - { - int bkptno = -1; - - for (int i = 0; i < results.length; i++) { - String var = results[i].getVariable(); - MIValue value = results[i].getMIValue(); - String str = ""; //$NON-NLS-1$ - if (value != null && value instanceof MIConst) { - str = ((MIConst)value).getString(); - } - - if (var.equals("bkptno")) { //$NON-NLS-1$ - try { - bkptno = Integer.parseInt(str.trim()); - } catch (NumberFormatException e) { - } - } - } - MIStoppedEvent stoppedEvent = MIStoppedEvent.parse(runControl, containerDmc, token, results); - return new MIBreakpointHitEvent(stoppedEvent.getDMContext(), token, results, stoppedEvent.getFrame(), bkptno); - } /** * @since 1.1 diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIDetachedEvent.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIDetachedEvent.java index a1ee505c16b..4b7dc6dacc6 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIDetachedEvent.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIDetachedEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,7 +14,6 @@ package org.eclipse.cdt.dsf.mi.service.command.events; import org.eclipse.cdt.dsf.concurrent.Immutable; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; -import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext; /** @@ -31,11 +30,6 @@ public class MIDetachedEvent extends MIEvent { super(ctx, token, null); } - @Deprecated - public MIDetachedEvent(MIControlDMContext ctx, int token) { - this ((ICommandControlDMContext)ctx, token); - } - @Override public String toString() { return "Detached"; //$NON-NLS-1$ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIFunctionFinishedEvent.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIFunctionFinishedEvent.java index 7b67b23fc1f..ac65b190a37 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIFunctionFinishedEvent.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIFunctionFinishedEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,9 +13,7 @@ package org.eclipse.cdt.dsf.mi.service.command.events; import org.eclipse.cdt.dsf.concurrent.Immutable; -import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerDMContext; import org.eclipse.cdt.dsf.debug.service.IRunControl.IExecutionDMContext; -import org.eclipse.cdt.dsf.mi.service.MIRunControl; import org.eclipse.cdt.dsf.mi.service.command.output.MIConst; import org.eclipse.cdt.dsf.mi.service.command.output.MIFrame; import org.eclipse.cdt.dsf.mi.service.command.output.MIResult; @@ -53,35 +51,6 @@ public class MIFunctionFinishedEvent extends MIStoppedEvent { return returnType; } - @Deprecated - public static MIFunctionFinishedEvent parse( - MIRunControl runControl, IContainerDMContext containerDmc, int token, MIResult[] results) - { - String gdbResult = ""; //$NON-NLS-1$ - String returnValue = ""; //$NON-NLS-1$ - String returnType = ""; //$NON-NLS-1$ - - for (int i = 0; i < results.length; i++) { - String var = results[i].getVariable(); - MIValue value = results[i].getMIValue(); - String str = ""; //$NON-NLS-1$ - if (value instanceof MIConst) { - str = ((MIConst)value).getString(); - } - - if (var.equals("gdb-result-var")) { //$NON-NLS-1$ - gdbResult = str; - } else if (var.equals("return-value")) { //$NON-NLS-1$ - returnValue = str; - } else if (var.equals("return-type")) { //$NON-NLS-1$ - returnType = str; - } - } - - MIStoppedEvent stoppedEvent = MIStoppedEvent.parse(runControl, containerDmc, token, results); - return new MIFunctionFinishedEvent(stoppedEvent.getDMContext(), token, results, stoppedEvent.getFrame(), gdbResult, returnValue, returnType); - } - /** * @since 1.1 */ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIGDBExitEvent.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIGDBExitEvent.java deleted file mode 100644 index d6d688887c6..00000000000 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIGDBExitEvent.java +++ /dev/null @@ -1,42 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - * Wind River Systems - Modified for new DSF Reference Implementation - *******************************************************************************/ - -package org.eclipse.cdt.dsf.mi.service.command.events; - -import org.eclipse.cdt.dsf.concurrent.Immutable; -import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService; -import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; -import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext; - - -/** - * Gdb Session terminated. - * - * @deprecated This event is not used in DSF-GDB as it has been replaced by - * {@link ICommandControlService.ICommandControlShutdownDMEvent}. - */ -@Deprecated -@Immutable -public class MIGDBExitEvent extends MIEvent { - - /** - * @since 1.1 - */ - public MIGDBExitEvent(ICommandControlDMContext ctx, int token) { - super(ctx, token, null); - } - - @Deprecated - public MIGDBExitEvent(MIControlDMContext ctx, int token) { - this ((ICommandControlDMContext)ctx, token); - } -} diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIInferiorExitEvent.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIInferiorExitEvent.java index 8b3c5451637..c7a326c52ba 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIInferiorExitEvent.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIInferiorExitEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,7 +14,6 @@ package org.eclipse.cdt.dsf.mi.service.command.events; import org.eclipse.cdt.dsf.concurrent.Immutable; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; -import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext; import org.eclipse.cdt.dsf.mi.service.command.output.MIConst; import org.eclipse.cdt.dsf.mi.service.command.output.MIResult; import org.eclipse.cdt.dsf.mi.service.command.output.MIValue; @@ -38,20 +37,10 @@ public class MIInferiorExitEvent extends MIEvent { this.code = code; } - @Deprecated - public MIInferiorExitEvent(MIControlDMContext ctx, int token, MIResult[] results, int code) { - this ((ICommandControlDMContext)ctx, token, results, code); - } - public int getExitCode() { return code; } - @Deprecated - public static MIInferiorExitEvent parse(MIControlDMContext ctx, int token, MIResult[] results) { - return parse((ICommandControlDMContext)ctx, token, results); - } - /** * @since 1.1 */ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIInferiorSignalExitEvent.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIInferiorSignalExitEvent.java index 1ddb7e79dfc..8319a32958b 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIInferiorSignalExitEvent.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIInferiorSignalExitEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,7 +14,6 @@ package org.eclipse.cdt.dsf.mi.service.command.events; import org.eclipse.cdt.dsf.concurrent.Immutable; import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; -import org.eclipse.cdt.dsf.mi.service.command.MIControlDMContext; import org.eclipse.cdt.dsf.mi.service.command.output.MIConst; import org.eclipse.cdt.dsf.mi.service.command.output.MIResult; import org.eclipse.cdt.dsf.mi.service.command.output.MIValue; @@ -40,11 +39,6 @@ public class MIInferiorSignalExitEvent extends MIEvent this.sigMeaning = sigMeaning; } - @Deprecated - public MIInferiorSignalExitEvent(MIControlDMContext ctx, int token, MIResult[] results, String sigName, String sigMeaning) { - this((ICommandControlDMContext)ctx, token, results, sigName, sigMeaning); - } - public String getName() { return sigName; } @@ -53,11 +47,6 @@ public class MIInferiorSignalExitEvent extends MIEvent return sigMeaning; } - @Deprecated - public static MIInferiorSignalExitEvent parse(MIControlDMContext ctx, int token, MIResult[] results) { - return parse((ICommandControlDMContext)ctx, token, results); - } - /** * @since 1.1 */ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MILocationReachedEvent.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MILocationReachedEvent.java index 8084a5e3d7e..d15f13e25ec 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MILocationReachedEvent.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MILocationReachedEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,9 +13,7 @@ package org.eclipse.cdt.dsf.mi.service.command.events; import org.eclipse.cdt.dsf.concurrent.Immutable; -import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerDMContext; import org.eclipse.cdt.dsf.debug.service.IRunControl.IExecutionDMContext; -import org.eclipse.cdt.dsf.mi.service.MIRunControl; import org.eclipse.cdt.dsf.mi.service.command.output.MIFrame; import org.eclipse.cdt.dsf.mi.service.command.output.MIResult; @@ -28,14 +26,6 @@ public class MILocationReachedEvent extends MIStoppedEvent { protected MILocationReachedEvent(IExecutionDMContext ctx, int token, MIResult[] results, MIFrame frame) { super(ctx, token, results, frame); } - - @Deprecated - public static MILocationReachedEvent parse( - MIRunControl runControl, IContainerDMContext containerDmc, int token, MIResult[] results) - { - MIStoppedEvent stoppedEvent = MIStoppedEvent.parse(runControl, containerDmc, token, results); - return new MILocationReachedEvent(stoppedEvent.getDMContext(), token, results, stoppedEvent.getFrame()); - } /** * @since 1.1 diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MISharedLibEvent.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MISharedLibEvent.java index c2fa6e7b7fd..beb309ec7fd 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MISharedLibEvent.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MISharedLibEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,9 +13,7 @@ package org.eclipse.cdt.dsf.mi.service.command.events; import org.eclipse.cdt.dsf.concurrent.Immutable; -import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerDMContext; import org.eclipse.cdt.dsf.debug.service.IRunControl.IExecutionDMContext; -import org.eclipse.cdt.dsf.mi.service.MIRunControl; import org.eclipse.cdt.dsf.mi.service.command.output.MIFrame; import org.eclipse.cdt.dsf.mi.service.command.output.MIResult; @@ -29,18 +27,9 @@ public class MISharedLibEvent extends MIStoppedEvent { super(ctx, token, results, frame); } - @Deprecated - public static MIStoppedEvent parse( - MIRunControl runControl, IContainerDMContext containerDmc, int token, MIResult[] results) - { - MIStoppedEvent stoppedEvent = MIStoppedEvent.parse(runControl, containerDmc, token, results); - return new MISharedLibEvent(stoppedEvent.getDMContext(), token, results, stoppedEvent.getFrame()); - } - public static MIStoppedEvent parse(IExecutionDMContext dmc, int token, MIResult[] results) { MIStoppedEvent stoppedEvent = MIStoppedEvent.parse(dmc, token, results); return new MISharedLibEvent(stoppedEvent.getDMContext(), token, results, stoppedEvent.getFrame()); } - } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MISignalEvent.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MISignalEvent.java index d93549e5727..a79f2571ffa 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MISignalEvent.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MISignalEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,9 +13,7 @@ package org.eclipse.cdt.dsf.mi.service.command.events; import org.eclipse.cdt.dsf.concurrent.Immutable; -import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerDMContext; import org.eclipse.cdt.dsf.debug.service.IRunControl.IExecutionDMContext; -import org.eclipse.cdt.dsf.mi.service.MIRunControl; import org.eclipse.cdt.dsf.mi.service.command.output.MIConst; import org.eclipse.cdt.dsf.mi.service.command.output.MIFrame; import org.eclipse.cdt.dsf.mi.service.command.output.MIResult; @@ -47,33 +45,6 @@ public class MISignalEvent extends MIStoppedEvent { public String getMeaning() { return sigMeaning; } - - - @Deprecated - public static MISignalEvent parse( - MIRunControl runControl, IContainerDMContext containerDmc, int token, MIResult[] results) - { - String sigName = ""; //$NON-NLS-1$ - String sigMeaning = ""; //$NON-NLS-1$ - - for (int i = 0; i < results.length; i++) { - String var = results[i].getVariable(); - MIValue value = results[i].getMIValue(); - String str = ""; //$NON-NLS-1$ - if (value instanceof MIConst) { - str = ((MIConst)value).getString(); - } - - if (var.equals("signal-name")) { //$NON-NLS-1$ - sigName = str; - } else if (var.equals("signal-meaning")) { //$NON-NLS-1$ - sigMeaning = str; - } - } - MIStoppedEvent stoppedEvent = MIStoppedEvent.parse(runControl, containerDmc, token, results); - return new MISignalEvent(stoppedEvent.getDMContext(), token, results, stoppedEvent.getFrame(), sigName, sigMeaning); - - } /** * @since 1.1 diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MISteppingRangeEvent.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MISteppingRangeEvent.java index e4ee34beb26..1430e83e66b 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MISteppingRangeEvent.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MISteppingRangeEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,9 +13,7 @@ package org.eclipse.cdt.dsf.mi.service.command.events; import org.eclipse.cdt.dsf.concurrent.Immutable; -import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerDMContext; import org.eclipse.cdt.dsf.debug.service.IRunControl.IExecutionDMContext; -import org.eclipse.cdt.dsf.mi.service.MIRunControl; import org.eclipse.cdt.dsf.mi.service.command.output.MIFrame; import org.eclipse.cdt.dsf.mi.service.command.output.MIResult; @@ -28,15 +26,7 @@ public class MISteppingRangeEvent extends MIStoppedEvent { protected MISteppingRangeEvent(IExecutionDMContext ctx, int token, MIResult[] results, MIFrame frame) { super(ctx, token, results, frame); - } - - @Deprecated - public static MISteppingRangeEvent parse( - MIRunControl runControl, IContainerDMContext containerDmc, int token, MIResult[] results) - { - MIStoppedEvent stoppedEvent = MIStoppedEvent.parse(runControl, containerDmc, token, results); - return new MISteppingRangeEvent(stoppedEvent.getDMContext(), token, results, stoppedEvent.getFrame()); - } + } /** * @since 1.1 diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIStoppedEvent.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIStoppedEvent.java index f897211df89..283bc7db889 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIStoppedEvent.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIStoppedEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,10 +13,7 @@ package org.eclipse.cdt.dsf.mi.service.command.events; import org.eclipse.cdt.dsf.concurrent.Immutable; -import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerDMContext; import org.eclipse.cdt.dsf.debug.service.IRunControl.IExecutionDMContext; -import org.eclipse.cdt.dsf.mi.service.MIRunControl; -import org.eclipse.cdt.dsf.mi.service.command.output.MIConst; import org.eclipse.cdt.dsf.mi.service.command.output.MIFrame; import org.eclipse.cdt.dsf.mi.service.command.output.MIResult; import org.eclipse.cdt.dsf.mi.service.command.output.MITuple; @@ -39,38 +36,6 @@ public class MIStoppedEvent extends MIEvent { public MIFrame getFrame() { return frame; } - - @Deprecated - public static MIStoppedEvent parse( - MIRunControl runControl, IContainerDMContext containerDmc, int token, MIResult[] results) - { - int threadId = -1; - MIFrame frame = null; - - for (int i = 0; i < results.length; i++) { - String var = results[i].getVariable(); - MIValue value = results[i].getMIValue(); - - if (var.equals("thread-id")) { //$NON-NLS-1$ - if (value instanceof MIConst) { - String str = ((MIConst)value).getString(); - try { - threadId = Integer.parseInt(str.trim()); - } catch (NumberFormatException e) { - } - } - } else if (var.equals("frame")) { //$NON-NLS-1$ - if (value instanceof MITuple) { - frame = new MIFrame((MITuple)value); - } - } - } - IExecutionDMContext execDmc = containerDmc; - if (runControl != null && threadId != -1) { - execDmc = runControl.createMIExecutionContext(containerDmc, threadId); - } - return new MIStoppedEvent(execDmc, token, results, frame); - } /** * @since 1.1 diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIWatchpointScopeEvent.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIWatchpointScopeEvent.java index 3d12e73f769..8b26dbde8fd 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIWatchpointScopeEvent.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIWatchpointScopeEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,9 +13,7 @@ package org.eclipse.cdt.dsf.mi.service.command.events; import org.eclipse.cdt.dsf.concurrent.Immutable; -import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerDMContext; import org.eclipse.cdt.dsf.debug.service.IRunControl.IExecutionDMContext; -import org.eclipse.cdt.dsf.mi.service.MIRunControl; import org.eclipse.cdt.dsf.mi.service.command.output.MIConst; import org.eclipse.cdt.dsf.mi.service.command.output.MIFrame; import org.eclipse.cdt.dsf.mi.service.command.output.MIResult; @@ -41,30 +39,6 @@ public class MIWatchpointScopeEvent extends MIStoppedEvent { return number; } - @Deprecated - public static MIWatchpointScopeEvent parse( - MIRunControl runControl, IContainerDMContext containerDmc, int token, MIResult[] results) - { - int number = 0; - for (int i = 0; i < results.length; i++) { - String var = results[i].getVariable(); - MIValue value = results[i].getMIValue(); - - if (var.equals("wpnum")) { //$NON-NLS-1$ - if (value instanceof MIConst) { - String str = ((MIConst) value).getString(); - try { - number = Integer.parseInt(str.trim()); - } catch (NumberFormatException e) { - } - } - } - } - - MIStoppedEvent stoppedEvent = MIStoppedEvent.parse(runControl, containerDmc, token, results); - return new MIWatchpointScopeEvent(stoppedEvent.getDMContext(), token, results, stoppedEvent.getFrame(), number); - } - /** * @since 1.1 */ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIWatchpointTriggerEvent.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIWatchpointTriggerEvent.java index 783fcd64b26..5fbdc239e38 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIWatchpointTriggerEvent.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/events/MIWatchpointTriggerEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2009 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,9 +13,7 @@ package org.eclipse.cdt.dsf.mi.service.command.events; import org.eclipse.cdt.dsf.concurrent.Immutable; -import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerDMContext; import org.eclipse.cdt.dsf.debug.service.IRunControl.IExecutionDMContext; -import org.eclipse.cdt.dsf.mi.service.MIRunControl; import org.eclipse.cdt.dsf.mi.service.command.output.MIConst; import org.eclipse.cdt.dsf.mi.service.command.output.MIFrame; import org.eclipse.cdt.dsf.mi.service.command.output.MIResult; @@ -61,66 +59,6 @@ public class MIWatchpointTriggerEvent extends MIStoppedEvent { return newValue; } - @Deprecated - public static MIWatchpointTriggerEvent parse( - MIRunControl runControl, IContainerDMContext containerDmc, int token, MIResult[] results) - { - int number = 0; - String exp = ""; //$NON-NLS-1$ - String oldValue = ""; //$NON-NLS-1$ - String newValue = ""; //$NON-NLS-1$ - - for (int i = 0; i < results.length; i++) { - String var = results[i].getVariable(); - MIValue value = results[i].getMIValue(); - - if (var.equals("wpt") || var.equals("hw-awpt") || var.equals("hw-rwpt")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - if (value instanceof MITuple) { - for (MIResult wptResult : ((MITuple) value).getMIResults()) { - String wptVar = wptResult.getVariable(); - MIValue wptValue = wptResult.getMIValue(); - - if (wptVar.equals("number")) { //$NON-NLS-1$ - if (wptValue instanceof MIConst) { - String str = ((MIConst) wptValue).getString(); - try { - number = Integer.parseInt(str); - } catch (NumberFormatException e) { - } - } - } else if (wptVar.equals("exp")) { //$NON-NLS-1$ - if (wptValue instanceof MIConst) { - exp = ((MIConst) wptValue).getString(); - } - } - } - } - } else if (var.equals("value")) { //$NON-NLS-1$ - if (value instanceof MITuple) { - for (MIResult valueResult : ((MITuple)value).getMIResults()) { - String valueVar = valueResult.getVariable(); - MIValue valueValue = valueResult.getMIValue(); - String str = ""; //$NON-NLS-1$ - if (valueValue instanceof MIConst) { - str = ((MIConst) valueValue).getString(); - } - - if (valueVar.equals("old")) { //$NON-NLS-1$ - oldValue = str; - } else if (valueVar.equals("new")) { //$NON-NLS-1$ - newValue = str; - } else if (valueVar.equals("value")) { //$NON-NLS-1$ - oldValue = newValue = str; - } - } - - } - } - } - MIStoppedEvent stoppedEvent = MIStoppedEvent.parse(runControl, containerDmc, token, results); - return new MIWatchpointTriggerEvent(stoppedEvent.getDMContext(), token, results, stoppedEvent.getFrame(), number, exp, oldValue, newValue); - } - /** * @since 1.1 */ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/CLIMonitorListProcessesInfo.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/CLIMonitorListProcessesInfo.java index df8de5eea87..e4411993d17 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/CLIMonitorListProcessesInfo.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/CLIMonitorListProcessesInfo.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 Ericsson and others. + * Copyright (c) 2009 Ericsson and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at