1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 09:46:02 +02:00

[266588] Cleanup of Deprecated things as we are going to 2.0

This commit is contained in:
Marc Khouzam 2009-02-28 16:05:41 +00:00
parent 1ce6b217da
commit 29521b9edc
43 changed files with 42 additions and 627 deletions

View file

@ -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.MIBreakInsert;
import org.eclipse.cdt.dsf.mi.service.command.commands.MIBreakList; 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.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.events.MIWatchpointScopeEvent;
import org.eclipse.cdt.dsf.mi.service.command.output.MIBreakInsertInfo; import org.eclipse.cdt.dsf.mi.service.command.output.MIBreakInsertInfo;
import org.eclipse.cdt.dsf.mi.service.command.output.MIBreakListInfo; 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 * @since 1.1
* @nooverride This method is not intended to be re-implemented or extended by clients. * @nooverride This method is not intended to be re-implemented or extended by clients.

View file

@ -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.MIRunControl.SuspendedEvent;
import org.eclipse.cdt.dsf.mi.service.breakpoint.actions.BreakpointActionAdapter; 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.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.MIWatchpointScopeEvent;
import org.eclipse.cdt.dsf.mi.service.command.events.MIWatchpointTriggerEvent; import org.eclipse.cdt.dsf.mi.service.command.events.MIWatchpointTriggerEvent;
import org.eclipse.cdt.dsf.service.AbstractDsfService; import org.eclipse.cdt.dsf.service.AbstractDsfService;
@ -1259,18 +1258,6 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
// Session exit // 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 * @since 1.1
* @nooverride This method is not intended to be re-implemented or extended by clients. * @nooverride This method is not intended to be re-implemented or extended by clients.

View file

@ -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.MIBreakpointHitEvent;
import org.eclipse.cdt.dsf.mi.service.command.events.MIErrorEvent; 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.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.MIRunningEvent;
import org.eclipse.cdt.dsf.mi.service.command.events.MISharedLibEvent; import org.eclipse.cdt.dsf.mi.service.command.events.MISharedLibEvent;
import org.eclipse.cdt.dsf.mi.service.command.events.MISignalEvent; import org.eclipse.cdt.dsf.mi.service.command.events.MISignalEvent;
@ -430,16 +429,6 @@ public class MIRunControl extends AbstractDsfService implements IRunControl, ICa
fStepping = false; 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. * @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. * @noreference This method is not intended to be referenced by clients.

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -122,16 +122,8 @@ public abstract class AbstractCLIProcess extends Process
fMIInLogPipe = miInLogPipe; fMIInLogPipe = miInLogPipe;
} }
@Deprecated
public AbstractCLIProcess(AbstractMIControl commandControl) throws IOException {
this ( (ICommandControlService)commandControl );
}
protected DsfSession getSession() { return fSession; } protected DsfSession getSession() { return fSession; }
@Deprecated
protected AbstractMIControl getCommandControl() { return (AbstractMIControl)fCommandControl; }
/** /**
* @since 1.1 * @since 1.1
*/ */

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -73,20 +73,11 @@ public class CLIEventProcessor
fLastThreadId = 0; fLastThreadId = 0;
} }
@Deprecated
public CLIEventProcessor(AbstractMIControl connection, IContainerDMContext containerDmc, MIInferiorProcess inferior) {
this(connection, DMContexts.getAncestorOfType(containerDmc, ICommandControlDMContext.class));
}
public void dispose() { public void dispose() {
fCommandControl.removeCommandListener(this); fCommandControl.removeCommandListener(this);
fCommandControl.removeEventListener(this); fCommandControl.removeEventListener(this);
fServicesTracker.dispose(); fServicesTracker.dispose();
} }
@Deprecated
public void resetInferior(MIInferiorProcess inferior) {
}
public void commandSent(ICommandToken token) { public void commandSent(ICommandToken token) {
if (token.getCommand() instanceof CLICommand<?>) { if (token.getCommand() instanceof CLICommand<?>) {

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * 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.IDsfStatusConstants;
import org.eclipse.cdt.dsf.concurrent.ImmediateExecutor; import org.eclipse.cdt.dsf.concurrent.ImmediateExecutor;
import org.eclipse.cdt.dsf.concurrent.Query; 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.IContainerDMContext;
import org.eclipse.cdt.dsf.debug.service.IRunControl.IExecutionDMContext; 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.ICommandControlService;
import org.eclipse.cdt.dsf.debug.service.command.ICommandListener; import org.eclipse.cdt.dsf.debug.service.command.ICommandListener;
import org.eclipse.cdt.dsf.debug.service.command.ICommandResult; import org.eclipse.cdt.dsf.debug.service.command.ICommandResult;
@ -70,34 +67,6 @@ public class MIInferiorProcess extends Process
implements IEventListener, ICommandListener 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<IExecutionDMContext>
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<IExecutionDMContext>
implements IExitedDMEvent
{
public InferiorExitedDMEvent(IExecutionDMContext context) {
super(context);
}
}
public enum State { RUNNING, STOPPED, TERMINATED } public enum State { RUNNING, STOPPED, TERMINATED }
private final OutputStream fOutputStream; private final OutputStream fOutputStream;
@ -153,21 +122,6 @@ public class MIInferiorProcess extends Process
this(commandControl, gdbOutputStream, null); 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 * Creates an inferior process object which uses the given terminal
* to write the user standard input into. * to write the user standard input into.
@ -183,21 +137,6 @@ public class MIInferiorProcess extends Process
this(commandControl, null, p); 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") @ConfinedToDsfExecutor("fSession#getExecutor")
private MIInferiorProcess(ICommandControlService commandControl, final OutputStream gdbOutputStream, PTY p) { private MIInferiorProcess(ICommandControlService commandControl, final OutputStream gdbOutputStream, PTY p) {
fCommandControl = commandControl; fCommandControl = commandControl;
@ -262,9 +201,6 @@ public class MIInferiorProcess extends Process
return fSession; return fSession;
} }
@Deprecated
protected AbstractMIControl getCommandControl() { return (AbstractMIControl)fCommandControl; }
/** /**
* @since 1.1 * @since 1.1
*/ */

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * 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.LinkedList;
import java.util.List; 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.IProcessDMContext;
import org.eclipse.cdt.dsf.debug.service.IProcesses.IThreadDMContext; import org.eclipse.cdt.dsf.debug.service.IProcesses.IThreadDMContext;
import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerDMContext; import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerDMContext;
@ -96,12 +95,6 @@ public class MIRunControlEventProcessor
connection.addCommandListener(this); 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. * This processor must be disposed before the control service is un-registered.
*/ */

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -13,7 +13,6 @@
package org.eclipse.cdt.dsf.mi.service.command.commands; package org.eclipse.cdt.dsf.mi.service.command.commands;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; 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; import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
/** /**
@ -31,9 +30,4 @@ public class CLIExecAbort extends CLICommand<MIInfo>
public CLIExecAbort(ICommandControlDMContext ctx) { public CLIExecAbort(ICommandControlDMContext ctx) {
super(ctx, "kill"); //$NON-NLS-1$ super(ctx, "kill"); //$NON-NLS-1$
} }
@Deprecated
public CLIExecAbort(MIControlDMContext ctx) {
this ((ICommandControlDMContext)ctx);
}
} }

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -11,7 +11,6 @@
package org.eclipse.cdt.dsf.mi.service.command.commands; package org.eclipse.cdt.dsf.mi.service.command.commands;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; 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; import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
/** /**
@ -28,9 +27,4 @@ public class CLISource extends CLICommand<MIInfo> {
public CLISource(ICommandControlDMContext ctx, String file) { public CLISource(ICommandControlDMContext ctx, String file) {
super(ctx, "source " + file); //$NON-NLS-1$ super(ctx, "source " + file); //$NON-NLS-1$
} }
@Deprecated
public CLISource(MIControlDMContext ctx, String file) {
this ((ICommandControlDMContext)ctx, file);
}
} }

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * 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.IStack.IFrameDMContext;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; 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.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.MIDataEvaluateExpressionInfo;
import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput; import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput;
@ -38,12 +37,6 @@ public class MIDataEvaluateExpression<V extends MIDataEvaluateExpressionInfo> ex
super(ctx, "-data-evaluate-expression", new String[]{expr}); //$NON-NLS-1$ 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) { public MIDataEvaluateExpression(IMIExecutionDMContext execDmc, String expr) {
super(execDmc, "-data-evaluate-expression", new String[]{expr}); //$NON-NLS-1$ super(execDmc, "-data-evaluate-expression", new String[]{expr}); //$NON-NLS-1$
} }

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -12,7 +12,6 @@
package org.eclipse.cdt.dsf.mi.service.command.commands; package org.eclipse.cdt.dsf.mi.service.command.commands;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; 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; import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
@ -32,21 +31,11 @@ public class MIFileExecAndSymbols extends MICommand<MIInfo>
public MIFileExecAndSymbols(ICommandControlDMContext dmc, String file) { public MIFileExecAndSymbols(ICommandControlDMContext dmc, String file) {
super(dmc, "-file-exec-and-symbols", null, new String[] {file}); //$NON-NLS-1$ 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 * @since 1.1
*/ */
public MIFileExecAndSymbols(ICommandControlDMContext dmc) { public MIFileExecAndSymbols(ICommandControlDMContext dmc) {
super(dmc, "-file-exec-and-symbols"); //$NON-NLS-1$ super(dmc, "-file-exec-and-symbols"); //$NON-NLS-1$
} }
@Deprecated
public MIFileExecAndSymbols(MIControlDMContext dmc) {
this ((ICommandControlDMContext)dmc);
}
} }

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -13,7 +13,6 @@
package org.eclipse.cdt.dsf.mi.service.command.commands; package org.eclipse.cdt.dsf.mi.service.command.commands;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; 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; import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
@ -34,20 +33,10 @@ public class MIFileExecFile extends MICommand<MIInfo>
super(dmc, "-file-exec-file", null, new String[] {file}); //$NON-NLS-1$ 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 * @since 1.1
*/ */
public MIFileExecFile(ICommandControlDMContext dmc) { public MIFileExecFile(ICommandControlDMContext dmc) {
super(dmc, "-file-exec-file"); //$NON-NLS-1$ super(dmc, "-file-exec-file"); //$NON-NLS-1$
} }
@Deprecated
public MIFileExecFile(MIControlDMContext dmc) {
this ((ICommandControlDMContext)dmc);
}
} }

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -13,7 +13,6 @@
package org.eclipse.cdt.dsf.mi.service.command.commands; package org.eclipse.cdt.dsf.mi.service.command.commands;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; 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; import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
@ -32,11 +31,6 @@ public class MIFileSymbolFile extends MICommand<MIInfo>
public MIFileSymbolFile(ICommandControlDMContext dmc, String file) { public MIFileSymbolFile(ICommandControlDMContext dmc, String file) {
super(dmc, "-file-symbol-file", null, new String[] {file}); //$NON-NLS-1$ 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 * @since 1.1
@ -44,9 +38,4 @@ public class MIFileSymbolFile extends MICommand<MIInfo>
public MIFileSymbolFile(ICommandControlDMContext dmc) { public MIFileSymbolFile(ICommandControlDMContext dmc) {
super(dmc, "-file-symbol-file"); //$NON-NLS-1$ super(dmc, "-file-symbol-file"); //$NON-NLS-1$
} }
@Deprecated
public MIFileSymbolFile(MIControlDMContext dmc) {
this ((ICommandControlDMContext)dmc);
}
} }

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -11,7 +11,6 @@
package org.eclipse.cdt.dsf.mi.service.command.commands; package org.eclipse.cdt.dsf.mi.service.command.commands;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; 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) { 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$ 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);
}
} }

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -11,7 +11,6 @@
package org.eclipse.cdt.dsf.mi.service.command.commands; package org.eclipse.cdt.dsf.mi.service.command.commands;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; 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$ String[] p = new String [] {"solib-search-path", buffer.toString()}; //$NON-NLS-1$
setParameters(p); setParameters(p);
} }
@Deprecated
public MIGDBSetSolibSearchPath(MIControlDMContext ctx, String[] paths) {
this ((ICommandControlDMContext)ctx, paths);
}
} }

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -13,7 +13,6 @@
package org.eclipse.cdt.dsf.mi.service.command.commands; package org.eclipse.cdt.dsf.mi.service.command.commands;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; 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.MIGDBShowExitCodeInfo;
import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput; import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput;
@ -34,11 +33,6 @@ public class MIGDBShowExitCode extends MIDataEvaluateExpression<MIGDBShowExitCod
super(ctx, "$_exitcode"); //$NON-NLS-1$ super(ctx, "$_exitcode"); //$NON-NLS-1$
} }
@Deprecated
public MIGDBShowExitCode(MIControlDMContext ctx) {
this ((ICommandControlDMContext)ctx);
}
@Override @Override
public MIGDBShowExitCodeInfo getResult(MIOutput output) { public MIGDBShowExitCodeInfo getResult(MIOutput output) {
return new MIGDBShowExitCodeInfo(output); return new MIGDBShowExitCodeInfo(output);

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -12,7 +12,6 @@
package org.eclipse.cdt.dsf.mi.service.command.commands; package org.eclipse.cdt.dsf.mi.service.command.commands;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; 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; import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
@ -29,9 +28,4 @@ public class MIInferiorTTYSet extends MICommand<MIInfo>
public MIInferiorTTYSet(ICommandControlDMContext dmc, String tty) { public MIInferiorTTYSet(ICommandControlDMContext dmc, String tty) {
super(dmc, "-inferior-tty-set", null, new String[] {tty}); //$NON-NLS-1$ super(dmc, "-inferior-tty-set", null, new String[] {tty}); //$NON-NLS-1$
} }
@Deprecated
public MIInferiorTTYSet(MIControlDMContext dmc, String tty) {
this ((ICommandControlDMContext)dmc, tty);
}
} }

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * 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<MIInfo> { public class MITargetSelect extends MICommand<MIInfo> {
@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 * @since 1.1
*/ */

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -12,7 +12,6 @@
package org.eclipse.cdt.dsf.mi.service.command.commands; package org.eclipse.cdt.dsf.mi.service.command.commands;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; 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.MIOutput;
import org.eclipse.cdt.dsf.mi.service.command.output.MIVarAssignInfo; import org.eclipse.cdt.dsf.mi.service.command.output.MIVarAssignInfo;
@ -33,10 +32,6 @@ public class MIVarAssign extends MICommand<MIVarAssignInfo>
super(ctx, "-var-assign", new String[]{name, expression}); //$NON-NLS-1$ 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 @Override
public MIVarAssignInfo getResult(MIOutput out) { public MIVarAssignInfo getResult(MIOutput out) {
return new MIVarAssignInfo(out); return new MIVarAssignInfo(out);

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -13,7 +13,6 @@
package org.eclipse.cdt.dsf.mi.service.command.commands; package org.eclipse.cdt.dsf.mi.service.command.commands;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; 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.MIOutput;
import org.eclipse.cdt.dsf.mi.service.command.output.MIVarDeleteInfo; import org.eclipse.cdt.dsf.mi.service.command.output.MIVarDeleteInfo;
@ -35,11 +34,6 @@ public class MIVarDelete extends MICommand<MIVarDeleteInfo>
super(dmc, "-var-delete", new String[]{name}); //$NON-NLS-1$ super(dmc, "-var-delete", new String[]{name}); //$NON-NLS-1$
} }
@Deprecated
public MIVarDelete(MIControlDMContext dmc, String name) {
this ((ICommandControlDMContext)dmc, name);
}
@Override @Override
public MIVarDeleteInfo getResult(MIOutput out) { public MIVarDeleteInfo getResult(MIOutput out) {
return new MIVarDeleteInfo(out); return new MIVarDeleteInfo(out);

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -14,7 +14,6 @@
package org.eclipse.cdt.dsf.mi.service.command.commands; package org.eclipse.cdt.dsf.mi.service.command.commands;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; 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.MIOutput;
import org.eclipse.cdt.dsf.mi.service.command.output.MIVarEvaluateExpressionInfo; import org.eclipse.cdt.dsf.mi.service.command.output.MIVarEvaluateExpressionInfo;
@ -38,11 +37,6 @@ public class MIVarEvaluateExpression extends MICommand<MIVarEvaluateExpressionIn
super(dmc, "-var-evaluate-expression", new String[] { name }); //$NON-NLS-1$ super(dmc, "-var-evaluate-expression", new String[] { name }); //$NON-NLS-1$
} }
@Deprecated
public MIVarEvaluateExpression(MIControlDMContext dmc, String name) {
this ((ICommandControlDMContext)dmc, name);
}
@Override @Override
public MIVarEvaluateExpressionInfo getResult(MIOutput out) { public MIVarEvaluateExpressionInfo getResult(MIOutput out) {
return new MIVarEvaluateExpressionInfo(out); return new MIVarEvaluateExpressionInfo(out);

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -12,7 +12,6 @@
package org.eclipse.cdt.dsf.mi.service.command.commands; package org.eclipse.cdt.dsf.mi.service.command.commands;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; 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.MIOutput;
import org.eclipse.cdt.dsf.mi.service.command.output.MIVarInfoExpressionInfo; import org.eclipse.cdt.dsf.mi.service.command.output.MIVarInfoExpressionInfo;
@ -37,11 +36,6 @@ public class MIVarInfoExpression extends MICommand<MIVarInfoExpressionInfo>
public MIVarInfoExpression(ICommandControlDMContext ctx, String name) { public MIVarInfoExpression(ICommandControlDMContext ctx, String name) {
super(ctx, "-var-info-expression", new String[]{name}); //$NON-NLS-1$ super(ctx, "-var-info-expression", new String[]{name}); //$NON-NLS-1$
} }
@Deprecated
public MIVarInfoExpression(MIControlDMContext ctx, String name) {
this ((ICommandControlDMContext)ctx, name);
}
@Override @Override
public MIVarInfoExpressionInfo getResult(MIOutput out) { public MIVarInfoExpressionInfo getResult(MIOutput out) {

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -12,7 +12,6 @@
package org.eclipse.cdt.dsf.mi.service.command.commands; package org.eclipse.cdt.dsf.mi.service.command.commands;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; 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.MIOutput;
import org.eclipse.cdt.dsf.mi.service.command.output.MIVarInfoPathExpressionInfo; import org.eclipse.cdt.dsf.mi.service.command.output.MIVarInfoPathExpressionInfo;
@ -37,12 +36,7 @@ public class MIVarInfoPathExpression extends MICommand<MIVarInfoPathExpressionIn
public MIVarInfoPathExpression(ICommandControlDMContext dmc, String name) { public MIVarInfoPathExpression(ICommandControlDMContext dmc, String name) {
super(dmc, "-var-info-path-expression", new String[]{name}); //$NON-NLS-1$ super(dmc, "-var-info-path-expression", new String[]{name}); //$NON-NLS-1$
} }
@Deprecated
public MIVarInfoPathExpression(MIControlDMContext dmc, String name) {
this ((ICommandControlDMContext)dmc, name);
}
@Override @Override
public MIVarInfoPathExpressionInfo getResult(MIOutput out) { public MIVarInfoPathExpressionInfo getResult(MIOutput out) {
return new MIVarInfoPathExpressionInfo(out); return new MIVarInfoPathExpressionInfo(out);

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -12,7 +12,6 @@
package org.eclipse.cdt.dsf.mi.service.command.commands; package org.eclipse.cdt.dsf.mi.service.command.commands;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; 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.MIOutput;
import org.eclipse.cdt.dsf.mi.service.command.output.MIVarInfoTypeInfo; import org.eclipse.cdt.dsf.mi.service.command.output.MIVarInfoTypeInfo;
@ -36,11 +35,6 @@ public class MIVarInfoType extends MICommand<MIVarInfoTypeInfo>
super(ctx, "-var-info-type", new String[]{name}); //$NON-NLS-1$ super(ctx, "-var-info-type", new String[]{name}); //$NON-NLS-1$
} }
@Deprecated
public MIVarInfoType(MIControlDMContext ctx, String name) {
this ((ICommandControlDMContext)ctx, name);
}
@Override @Override
public MIVarInfoTypeInfo getResult(MIOutput out) { public MIVarInfoTypeInfo getResult(MIOutput out) {
return new MIVarInfoTypeInfo(out); return new MIVarInfoTypeInfo(out);

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * 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.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.MIOutput;
import org.eclipse.cdt.dsf.mi.service.command.output.MIVarListChildrenInfo; import org.eclipse.cdt.dsf.mi.service.command.output.MIVarListChildrenInfo;
@ -36,11 +35,6 @@ public class MIVarListChildren extends MICommand<MIVarListChildrenInfo>
public MIVarListChildren(ICommandControlDMContext ctx, String name) { public MIVarListChildren(ICommandControlDMContext ctx, String name) {
super(ctx, "-var-list-children", new String[]{name}); //$NON-NLS-1$ super(ctx, "-var-list-children", new String[]{name}); //$NON-NLS-1$
} }
@Deprecated
public MIVarListChildren(MIControlDMContext ctx, String name) {
this ((ICommandControlDMContext)ctx, name);
}
@Override @Override
public MIVarListChildrenInfo getResult(MIOutput out) { public MIVarListChildrenInfo getResult(MIOutput out) {

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * 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.IFormattedValues;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; 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.MIOutput;
import org.eclipse.cdt.dsf.mi.service.command.output.MIVarSetFormatInfo; import org.eclipse.cdt.dsf.mi.service.command.output.MIVarSetFormatInfo;
@ -42,11 +41,6 @@ public class MIVarSetFormat extends MICommand<MIVarSetFormatInfo>
setParameters(new String[]{name, getFormat(fmt)}); 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){ private String getFormat(String fmt){
String format = "natural"; //$NON-NLS-1$ String format = "natural"; //$NON-NLS-1$

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -12,7 +12,6 @@
package org.eclipse.cdt.dsf.mi.service.command.commands; package org.eclipse.cdt.dsf.mi.service.command.commands;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; 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.MIOutput;
import org.eclipse.cdt.dsf.mi.service.command.output.MIVarShowAttributesInfo; import org.eclipse.cdt.dsf.mi.service.command.output.MIVarShowAttributesInfo;
@ -37,11 +36,6 @@ public class MIVarShowAttributes extends MICommand<MIVarShowAttributesInfo>
public MIVarShowAttributes(ICommandControlDMContext ctx, String name) { public MIVarShowAttributes(ICommandControlDMContext ctx, String name) {
super(ctx, "-var-show-attributes", new String[]{name}); //$NON-NLS-1$ super(ctx, "-var-show-attributes", new String[]{name}); //$NON-NLS-1$
} }
@Deprecated
public MIVarShowAttributes(MIControlDMContext ctx, String name) {
this ((ICommandControlDMContext)ctx, name);
}
@Override @Override
public MIVarShowAttributesInfo getResult(MIOutput out) { public MIVarShowAttributesInfo getResult(MIOutput out) {

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -12,7 +12,6 @@
package org.eclipse.cdt.dsf.mi.service.command.commands; package org.eclipse.cdt.dsf.mi.service.command.commands;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; 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.MIOutput;
import org.eclipse.cdt.dsf.mi.service.command.output.MIVarShowFormatInfo; import org.eclipse.cdt.dsf.mi.service.command.output.MIVarShowFormatInfo;
@ -34,11 +33,6 @@ public class MIVarShowFormat extends MICommand<MIVarShowFormatInfo>
public MIVarShowFormat(ICommandControlDMContext ctx, String name) { public MIVarShowFormat(ICommandControlDMContext ctx, String name) {
super(ctx, "-var-show-format", new String[]{name}); //$NON-NLS-1$ super(ctx, "-var-show-format", new String[]{name}); //$NON-NLS-1$
} }
@Deprecated
public MIVarShowFormat(MIControlDMContext ctx, String name) {
this ((ICommandControlDMContext)ctx, name);
}
@Override @Override
public MIVarShowFormatInfo getResult(MIOutput out) { public MIVarShowFormatInfo getResult(MIOutput out) {

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -14,7 +14,6 @@
package org.eclipse.cdt.dsf.mi.service.command.commands; package org.eclipse.cdt.dsf.mi.service.command.commands;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; 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.MIOutput;
import org.eclipse.cdt.dsf.mi.service.command.output.MIVarUpdateInfo; import org.eclipse.cdt.dsf.mi.service.command.output.MIVarUpdateInfo;
@ -38,11 +37,6 @@ public class MIVarUpdate extends MICommand<MIVarUpdateInfo> {
public MIVarUpdate(ICommandControlDMContext dmc, String name) { public MIVarUpdate(ICommandControlDMContext dmc, String name) {
super(dmc, "-var-update", new String[] { "1", name }); //$NON-NLS-1$//$NON-NLS-2$ 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 @Override
public MIVarUpdateInfo getResult(MIOutput out) { public MIVarUpdateInfo getResult(MIOutput out) {

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -13,9 +13,7 @@
package org.eclipse.cdt.dsf.mi.service.command.events; package org.eclipse.cdt.dsf.mi.service.command.events;
import org.eclipse.cdt.dsf.concurrent.Immutable; 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.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.MIConst;
import org.eclipse.cdt.dsf.mi.service.command.output.MIFrame; 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.MIResult;
@ -38,31 +36,6 @@ public class MIBreakpointHitEvent extends MIStoppedEvent {
public int getNumber() { public int getNumber() {
return bkptno; 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 * @since 1.1

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * 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.concurrent.Immutable;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; 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<ICommandControlDMContext> {
super(ctx, token, null); super(ctx, token, null);
} }
@Deprecated
public MIDetachedEvent(MIControlDMContext ctx, int token) {
this ((ICommandControlDMContext)ctx, token);
}
@Override @Override
public String toString() { public String toString() {
return "Detached"; //$NON-NLS-1$ return "Detached"; //$NON-NLS-1$

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -13,9 +13,7 @@
package org.eclipse.cdt.dsf.mi.service.command.events; package org.eclipse.cdt.dsf.mi.service.command.events;
import org.eclipse.cdt.dsf.concurrent.Immutable; 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.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.MIConst;
import org.eclipse.cdt.dsf.mi.service.command.output.MIFrame; 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.MIResult;
@ -53,35 +51,6 @@ public class MIFunctionFinishedEvent extends MIStoppedEvent {
return returnType; 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 * @since 1.1
*/ */

View file

@ -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<ICommandControlDMContext> {
/**
* @since 1.1
*/
public MIGDBExitEvent(ICommandControlDMContext ctx, int token) {
super(ctx, token, null);
}
@Deprecated
public MIGDBExitEvent(MIControlDMContext ctx, int token) {
this ((ICommandControlDMContext)ctx, token);
}
}

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * 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.concurrent.Immutable;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; 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.MIConst;
import org.eclipse.cdt.dsf.mi.service.command.output.MIResult; import org.eclipse.cdt.dsf.mi.service.command.output.MIResult;
import org.eclipse.cdt.dsf.mi.service.command.output.MIValue; import org.eclipse.cdt.dsf.mi.service.command.output.MIValue;
@ -38,20 +37,10 @@ public class MIInferiorExitEvent extends MIEvent<ICommandControlDMContext> {
this.code = code; this.code = code;
} }
@Deprecated
public MIInferiorExitEvent(MIControlDMContext ctx, int token, MIResult[] results, int code) {
this ((ICommandControlDMContext)ctx, token, results, code);
}
public int getExitCode() { public int getExitCode() {
return code; return code;
} }
@Deprecated
public static MIInferiorExitEvent parse(MIControlDMContext ctx, int token, MIResult[] results) {
return parse((ICommandControlDMContext)ctx, token, results);
}
/** /**
* @since 1.1 * @since 1.1
*/ */

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * 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.concurrent.Immutable;
import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext; 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.MIConst;
import org.eclipse.cdt.dsf.mi.service.command.output.MIResult; import org.eclipse.cdt.dsf.mi.service.command.output.MIResult;
import org.eclipse.cdt.dsf.mi.service.command.output.MIValue; import org.eclipse.cdt.dsf.mi.service.command.output.MIValue;
@ -40,11 +39,6 @@ public class MIInferiorSignalExitEvent extends MIEvent<ICommandControlDMContext>
this.sigMeaning = sigMeaning; 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() { public String getName() {
return sigName; return sigName;
} }
@ -53,11 +47,6 @@ public class MIInferiorSignalExitEvent extends MIEvent<ICommandControlDMContext>
return sigMeaning; return sigMeaning;
} }
@Deprecated
public static MIInferiorSignalExitEvent parse(MIControlDMContext ctx, int token, MIResult[] results) {
return parse((ICommandControlDMContext)ctx, token, results);
}
/** /**
* @since 1.1 * @since 1.1
*/ */

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -13,9 +13,7 @@
package org.eclipse.cdt.dsf.mi.service.command.events; package org.eclipse.cdt.dsf.mi.service.command.events;
import org.eclipse.cdt.dsf.concurrent.Immutable; 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.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.MIFrame;
import org.eclipse.cdt.dsf.mi.service.command.output.MIResult; 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) { protected MILocationReachedEvent(IExecutionDMContext ctx, int token, MIResult[] results, MIFrame frame) {
super(ctx, token, results, 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 * @since 1.1

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -13,9 +13,7 @@
package org.eclipse.cdt.dsf.mi.service.command.events; package org.eclipse.cdt.dsf.mi.service.command.events;
import org.eclipse.cdt.dsf.concurrent.Immutable; 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.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.MIFrame;
import org.eclipse.cdt.dsf.mi.service.command.output.MIResult; import org.eclipse.cdt.dsf.mi.service.command.output.MIResult;
@ -29,18 +27,9 @@ public class MISharedLibEvent extends MIStoppedEvent {
super(ctx, token, results, frame); 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) public static MIStoppedEvent parse(IExecutionDMContext dmc, int token, MIResult[] results)
{ {
MIStoppedEvent stoppedEvent = MIStoppedEvent.parse(dmc, token, results); MIStoppedEvent stoppedEvent = MIStoppedEvent.parse(dmc, token, results);
return new MISharedLibEvent(stoppedEvent.getDMContext(), token, results, stoppedEvent.getFrame()); return new MISharedLibEvent(stoppedEvent.getDMContext(), token, results, stoppedEvent.getFrame());
} }
} }

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -13,9 +13,7 @@
package org.eclipse.cdt.dsf.mi.service.command.events; package org.eclipse.cdt.dsf.mi.service.command.events;
import org.eclipse.cdt.dsf.concurrent.Immutable; 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.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.MIConst;
import org.eclipse.cdt.dsf.mi.service.command.output.MIFrame; 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.MIResult;
@ -47,33 +45,6 @@ public class MISignalEvent extends MIStoppedEvent {
public String getMeaning() { public String getMeaning() {
return sigMeaning; 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 * @since 1.1

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -13,9 +13,7 @@
package org.eclipse.cdt.dsf.mi.service.command.events; package org.eclipse.cdt.dsf.mi.service.command.events;
import org.eclipse.cdt.dsf.concurrent.Immutable; 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.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.MIFrame;
import org.eclipse.cdt.dsf.mi.service.command.output.MIResult; 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) { protected MISteppingRangeEvent(IExecutionDMContext ctx, int token, MIResult[] results, MIFrame frame) {
super(ctx, token, results, 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 * @since 1.1

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -13,10 +13,7 @@
package org.eclipse.cdt.dsf.mi.service.command.events; package org.eclipse.cdt.dsf.mi.service.command.events;
import org.eclipse.cdt.dsf.concurrent.Immutable; 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.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.MIFrame;
import org.eclipse.cdt.dsf.mi.service.command.output.MIResult; import org.eclipse.cdt.dsf.mi.service.command.output.MIResult;
import org.eclipse.cdt.dsf.mi.service.command.output.MITuple; import org.eclipse.cdt.dsf.mi.service.command.output.MITuple;
@ -39,38 +36,6 @@ public class MIStoppedEvent extends MIEvent<IExecutionDMContext> {
public MIFrame getFrame() { public MIFrame getFrame() {
return frame; 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 * @since 1.1

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -13,9 +13,7 @@
package org.eclipse.cdt.dsf.mi.service.command.events; package org.eclipse.cdt.dsf.mi.service.command.events;
import org.eclipse.cdt.dsf.concurrent.Immutable; 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.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.MIConst;
import org.eclipse.cdt.dsf.mi.service.command.output.MIFrame; 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.MIResult;
@ -41,30 +39,6 @@ public class MIWatchpointScopeEvent extends MIStoppedEvent {
return number; 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 * @since 1.1
*/ */

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -13,9 +13,7 @@
package org.eclipse.cdt.dsf.mi.service.command.events; package org.eclipse.cdt.dsf.mi.service.command.events;
import org.eclipse.cdt.dsf.concurrent.Immutable; 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.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.MIConst;
import org.eclipse.cdt.dsf.mi.service.command.output.MIFrame; 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.MIResult;
@ -61,66 +59,6 @@ public class MIWatchpointTriggerEvent extends MIStoppedEvent {
return newValue; 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 * @since 1.1
*/ */

View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at