Attachment #160888 for bug #304618

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 323-329 Link Here

(-)src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java (-1 / +1 lines)
323	// When doing remote debugging, we use -exec-continue instead of -exec-run	323	// When doing remote debugging, we use -exec-continue instead of -exec-run
324	execCommand = getCommandFactory().createMIExecContinue(containerDmc);	324	execCommand = getCommandFactory().createMIExecContinue(containerDmc);
325	} else {	325	} else {
326	execCommand = getCommandFactory().createMIExecRun(containerDmc, new String[0]);	326	execCommand = getCommandFactory().createMIExecRun(containerDmc);
327	}	327	}
328		328
329	boolean stopInMain = false;	329	boolean stopInMain = false;

Lines 364-370 Link Here

(-)src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl_7_0.java (-1 / +1 lines)
364	// When doing remote debugging, we use -exec-continue instead of -exec-run	364	// When doing remote debugging, we use -exec-continue instead of -exec-run
365	fExecCommand = getCommandFactory().createMIExecContinue(fContainerDmc);	365	fExecCommand = getCommandFactory().createMIExecContinue(fContainerDmc);
366	} else {	366	} else {
367	fExecCommand = getCommandFactory().createMIExecRun(fContainerDmc, new String[0]);	367	fExecCommand = getCommandFactory().createMIExecRun(fContainerDmc);
368	}	368	}
369	rm.done();	369	rm.done();
370	}},	370	}},




		return new MIExecReturn(dmc);
	}

	public ICommand<MIInfo> createMIExecReturn(IFrameDMContext dmc, String arg) {
		return new MIExecReturn(dmc, arg);
	}

	public ICommand<MIInfo> createMIExecReverseContinue(IExecutionDMContext dmc) {
		return new MIExecReverseContinue(dmc);
	}

		return new MIExecRun(dmc);
	}

	public ICommand<MIInfo> createMIExecRun(IExecutionDMContext dmc, String[] args) {
		return new MIExecRun(dmc, args);
	}

	public ICommand<MIInfo> createMIExecStepInstruction(IExecutionDMContext dmc) {
		return new MIExecStepInstruction(dmc);
	}

Lines 26-32 Link Here

(-)src/org/eclipse/cdt/dsf/mi/service/command/commands/MIBreakAfter.java (-2 / +1 lines)
26	public class MIBreakAfter extends MICommand<MIInfo>	26	public class MIBreakAfter extends MICommand<MIInfo>
27	{	27	{
28	public MIBreakAfter(IBreakpointsTargetDMContext ctx, int breakpoint, int ignoreCount) {	28	public MIBreakAfter(IBreakpointsTargetDMContext ctx, int breakpoint, int ignoreCount) {
29	super(ctx, "-break-after"); //$NON-NLS-1$	29	super(ctx, "-break-after", new String[] { Integer.toString(breakpoint), Integer.toString(ignoreCount) }); //$NON-NLS-1$
30	setParameters(new String[] { Integer.toString(breakpoint), Integer.toString(ignoreCount) });
31	}	30	}
32	}	31	}

Lines 48-55 Link Here

(-)src/org/eclipse/cdt/dsf/mi/service/command/commands/MICommand.java (-2 / +2 lines)
48	this(ctx, operation, empty, empty);	48	this(ctx, operation, empty, empty);
49	}	49	}
50		50
51	public MICommand(IDMContext ctx, String operation, String[] options) {	51	public MICommand(IDMContext ctx, String operation, String[] params) {
52	this(ctx, operation, options, empty);	52	this(ctx, operation, empty, params);
53	}	53	}
54		54
55	public MICommand(IDMContext ctx, String operation, String[] options, String[] params) {	55	public MICommand(IDMContext ctx, String operation, String[] options, String[] params) {




public class MIEnvironmentDirectory extends MICommand<MIInfo> {
	
	public MIEnvironmentDirectory(IDMContext ctx, String[] paths, boolean reset) {
		super(ctx, "-environment-directory", paths); //$NON-NLS-1$

		String[] options;
		if (reset) {
			setOptions(new String[] {"-r"}); //$NON-NLS-1$
				options = new String[] {"-r"}; //$NON-NLS-1$
			} else {
				options = new String[paths.length + 1];
				options[0] = "-r"; //$NON-NLS-1$
				for (int i = 1; i < options.length; i++) {
					options[i] = paths[i-1];
				}
			}
		} else {
			options = paths;
		}
		
		setOptions(options);
	}
}

Lines 34-41 Link Here

(-)src/org/eclipse/cdt/dsf/mi/service/command/commands/MIExecReturn.java (-4 lines)
34	public MIExecReturn(IFrameDMContext dmc) {	34	public MIExecReturn(IFrameDMContext dmc) {
35	super(dmc, "-exec-return"); //$NON-NLS-1$	35	super(dmc, "-exec-return"); //$NON-NLS-1$
36	}	36	}
37
38	public MIExecReturn(IFrameDMContext dmc, String arg) {
39	super(dmc, "-exec-return", new String[] { arg }); //$NON-NLS-1$
40	}
41	}	37	}

Lines 30-37 Link Here

(-)src/org/eclipse/cdt/dsf/mi/service/command/commands/MIExecRun.java (-4 lines)
30	public MIExecRun(IExecutionDMContext dmc) {	30	public MIExecRun(IExecutionDMContext dmc) {
31	super(dmc, "-exec-run"); //$NON-NLS-1$	31	super(dmc, "-exec-run"); //$NON-NLS-1$
32	}	32	}
33
34	public MIExecRun(IExecutionDMContext dmc, String[] args) {
35	super(dmc, "-exec-run", args); //$NON-NLS-1$
36	}
37	}	33	}

Lines 1-5 Link Here

(-)src/org/eclipse/cdt/dsf/mi/service/command/commands/MIInterpreterExec.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 QNX Software Systems and others.	2	* Copyright (c) 2000, 2010 QNX Software Systems and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 38-44 Link Here
38	* @param oper	38	* @param oper
39	*/	39	*/
40	public MIInterpreterExec(IDMContext ctx, String interpreter, String cmd) {	40	public MIInterpreterExec(IDMContext ctx, String interpreter, String cmd) {
41	super(ctx, "-interpreter-exec", new String[]{interpreter}, new String[] {cmd}); //$NON-NLS-1$	41	super(ctx, "-interpreter-exec", new String[] {interpreter, cmd}); //$NON-NLS-1$
42	}	42	}
43		43
44	}	44	}

Lines 26-32 Link Here

(-)src/org/eclipse/cdt/dsf/mi/service/command/commands/MIStackSelectFrame.java (-1 / +1 lines)
26	public class MIStackSelectFrame extends MICommand<MIInfo> {	26	public class MIStackSelectFrame extends MICommand<MIInfo> {
27		27
28	public MIStackSelectFrame(IDMContext ctx, int frameNum) {	28	public MIStackSelectFrame(IDMContext ctx, int frameNum) {
29	super(ctx, "-stack-select-frame", new String[]{Integer.toString(frameNum)}, new String[0]); //$NON-NLS-1$	29	super(ctx, "-stack-select-frame", new String[]{Integer.toString(frameNum)}); //$NON-NLS-1$
30	}	30	}
31		31
32	@Override	32	@Override

Lines 28-34 Link Here

(-)src/org/eclipse/cdt/dsf/mi/service/command/commands/MIThreadSelect.java (-1 / +1 lines)
28	public class MIThreadSelect extends MICommand<MIInfo>	28	public class MIThreadSelect extends MICommand<MIInfo>
29	{	29	{
30	public MIThreadSelect(IDMContext ctx, int threadNum) {	30	public MIThreadSelect(IDMContext ctx, int threadNum) {
31	super(ctx, "-thread-select", new String[]{Integer.toString(threadNum)}); //$NON-NLS-1$	31	this(ctx, Integer.toString(threadNum));
32	}	32	}
33		33
34	/**	34	/**

Lines 35-41 Link Here

(-)src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarUpdate.java (-1 / +1 lines)
35	* @since 1.1	35	* @since 1.1
36	*/	36	*/
37	public MIVarUpdate(ICommandControlDMContext dmc, String name) {	37	public MIVarUpdate(ICommandControlDMContext dmc, String name) {
38	super(dmc, "-var-update", new String[] { "1" }, new String[] { name }); //$NON-NLS-1$//$NON-NLS-2$	38	super(dmc, "-var-update", new String[] { "1", name }); //$NON-NLS-1$//$NON-NLS-2$
39	}	39	}
40		40
41	@Override	41	@Override

Return to bug 304618

Lines 390-399 Link Here

(-)src/org/eclipse/cdt/dsf/mi/service/command/CommandFactory.java (-8 lines)
390	return new MIExecReturn(dmc);	390	return new MIExecReturn(dmc);
391	}	391	}
392		392
393	public ICommand<MIInfo> createMIExecReturn(IFrameDMContext dmc, String arg) {
394	return new MIExecReturn(dmc, arg);
395	}
396
397	public ICommand<MIInfo> createMIExecReverseContinue(IExecutionDMContext dmc) {	393	public ICommand<MIInfo> createMIExecReverseContinue(IExecutionDMContext dmc) {
398	return new MIExecReverseContinue(dmc);	394	return new MIExecReverseContinue(dmc);
399	}	395	}
Lines 434-443 Link Here
434	return new MIExecRun(dmc);	430	return new MIExecRun(dmc);
435	}	431	}
436		432
437	public ICommand<MIInfo> createMIExecRun(IExecutionDMContext dmc, String[] args) {
438	return new MIExecRun(dmc, args);
439	}
440
441	public ICommand<MIInfo> createMIExecStepInstruction(IExecutionDMContext dmc) {	433	public ICommand<MIInfo> createMIExecStepInstruction(IExecutionDMContext dmc) {
442	return new MIExecStepInstruction(dmc);	434	return new MIExecStepInstruction(dmc);
443	}	435	}

Lines 25-47 Link Here

(-)src/org/eclipse/cdt/dsf/mi/service/command/commands/MIEnvironmentDirectory.java (-15 / +2 lines)
25	public class MIEnvironmentDirectory extends MICommand<MIInfo> {	25	public class MIEnvironmentDirectory extends MICommand<MIInfo> {
26		26
27	public MIEnvironmentDirectory(IDMContext ctx, String[] paths, boolean reset) {	27	public MIEnvironmentDirectory(IDMContext ctx, String[] paths, boolean reset) {
28	super(ctx, "-environment-directory"); //$NON-NLS-1$	28	super(ctx, "-environment-directory", paths); //$NON-NLS-1$
29		29
30	String[] options;
31	if (reset) {	30	if (reset) {
32	if (paths == null) {	31	setOptions(new String[] {"-r"}); //$NON-NLS-1$
33	options = new String[] {"-r"}; //$NON-NLS-1$
34	} else {
35	options = new String[paths.length + 1];
36	options[0] = "-r"; //$NON-NLS-1$
37	for (int i = 1; i < options.length; i++) {
38	options[i] = paths[i-1];
39	}
40	}
41	} else {
42	options = paths;
43	}	32	}
44
45	setOptions(options);
46	}	33	}
47	}	34	}