mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-01 13:25:45 +02:00
Code Issues Wiki Activity

[304618] Most MICommands were created with their parameters treated as options.

Browse source
This commit is contained in:
Marc Khouzam 2010-03-04 14:00:02 +00:00
parent 96c2033d9f
commit 3e3b57e1d1
10 changed files with 20 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java
View file

@ -323,7 +323,7 @@ public class GDBControl extends AbstractMIControl implements IGDBControl {
// When doing remote debugging, we use -exec-continue instead of -exec-run // When doing remote debugging, we use -exec-continue instead of -exec-run
execCommand = getCommandFactory().createMIExecContinue(containerDmc); execCommand = getCommandFactory().createMIExecContinue(containerDmc);
} else { } else {
execCommand = getCommandFactory().createMIExecRun(containerDmc, new String[0]); execCommand = getCommandFactory().createMIExecRun(containerDmc);
} }
boolean stopInMain = false; boolean stopInMain = false;

2
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl_7_0.java
View file

@ -364,7 +364,7 @@ public class GDBControl_7_0 extends AbstractMIControl implements IGDBControl {
// When doing remote debugging, we use -exec-continue instead of -exec-run // When doing remote debugging, we use -exec-continue instead of -exec-run
fExecCommand = getCommandFactory().createMIExecContinue(fContainerDmc); fExecCommand = getCommandFactory().createMIExecContinue(fContainerDmc);
} else { } else {
fExecCommand = getCommandFactory().createMIExecRun(fContainerDmc, new String[0]); fExecCommand = getCommandFactory().createMIExecRun(fContainerDmc);
} }
rm.done(); rm.done();
}}, }},

5
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIBreakAfter.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2007 Ericsson and others. * Copyright (c) 2007, 2010 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
@ -26,7 +26,6 @@ import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
public class MIBreakAfter extends MICommand<MIInfo> public class MIBreakAfter extends MICommand<MIInfo>
{ {
public MIBreakAfter(IBreakpointsTargetDMContext ctx, int breakpoint, int ignoreCount) { public MIBreakAfter(IBreakpointsTargetDMContext ctx, int breakpoint, int ignoreCount) {
super(ctx, "-break-after"); //$NON-NLS-1$ super(ctx, "-break-after", new String[] { Integer.toString(breakpoint), Integer.toString(ignoreCount) }); //$NON-NLS-1$
setParameters(new String[] { Integer.toString(breakpoint), Integer.toString(ignoreCount) });
} }
} }

6
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MICommand.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2008 QNX Software Systems and others. * Copyright (c) 2000, 2010 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
@ -48,8 +48,8 @@ public class MICommand<V extends MIInfo> implements ICommand<V> {
this(ctx, operation, empty, empty); this(ctx, operation, empty, empty);
} }
public MICommand(IDMContext ctx, String operation, String[] options) { public MICommand(IDMContext ctx, String operation, String[] params) {
this(ctx, operation, options, empty); this(ctx, operation, empty, params);
} }
public MICommand(IDMContext ctx, String operation, String[] options, String[] params) { public MICommand(IDMContext ctx, String operation, String[] options, String[] params) {

19
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIEnvironmentDirectory.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2005, 2008 QNX Software Systems and others. * Copyright (c) 2000, 2010 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
@ -25,23 +25,10 @@ import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
public class MIEnvironmentDirectory extends MICommand<MIInfo> { public class MIEnvironmentDirectory extends MICommand<MIInfo> {
public MIEnvironmentDirectory(IDMContext ctx, String[] paths, boolean reset) { public MIEnvironmentDirectory(IDMContext ctx, String[] paths, boolean reset) {
super(ctx, "-environment-directory"); //$NON-NLS-1$ super(ctx, "-environment-directory", paths); //$NON-NLS-1$
String[] options;
if (reset) { if (reset) {
if (paths == null) { 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);
}
} }

6
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIExecRun.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2007 QNX Software Systems and others. * Copyright (c) 2000, 2010 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
@ -18,12 +18,14 @@ import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
/** /**
* *
* -exec-run * -exec-run [ARGS]
* *
* Asynchronous command. Starts execution of the inferior from the * Asynchronous command. Starts execution of the inferior from the
* beginning. The inferior executes until either a breakpoint is * beginning. The inferior executes until either a breakpoint is
* encountered or the program exits. * encountered or the program exits.
* *
* ARGS will be passed to the inferior. This option is not documented.
*
*/ */
public class MIExecRun extends MICommand<MIInfo> public class MIExecRun extends MICommand<MIInfo>
{ {

4
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIInterpreterExec.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2007 QNX Software Systems and others. * Copyright (c) 2000, 2010 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
@ -38,7 +38,7 @@ public class MIInterpreterExec<V extends MIInfo> extends MICommand<V> {
* @param oper * @param oper
*/ */
public MIInterpreterExec(IDMContext ctx, String interpreter, String cmd) { public MIInterpreterExec(IDMContext ctx, String interpreter, String cmd) {
super(ctx, "-interpreter-exec", new String[]{interpreter}, new String[] {cmd}); //$NON-NLS-1$ super(ctx, "-interpreter-exec", new String[] {interpreter, cmd}); //$NON-NLS-1$
} }
} }

2
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIStackSelectFrame.java
View file

@ -26,7 +26,7 @@ import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
public class MIStackSelectFrame extends MICommand<MIInfo> { public class MIStackSelectFrame extends MICommand<MIInfo> {
public MIStackSelectFrame(IDMContext ctx, int frameNum) { public MIStackSelectFrame(IDMContext ctx, int frameNum) {
super(ctx, "-stack-select-frame", new String[]{Integer.toString(frameNum)}, new String[0]); //$NON-NLS-1$ super(ctx, "-stack-select-frame", new String[]{Integer.toString(frameNum)}); //$NON-NLS-1$
} }
@Override @Override

2
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIThreadSelect.java
View file

@ -28,7 +28,7 @@ import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
public class MIThreadSelect extends MICommand<MIInfo> public class MIThreadSelect extends MICommand<MIInfo>
{ {
public MIThreadSelect(IDMContext ctx, int threadNum) { public MIThreadSelect(IDMContext ctx, int threadNum) {
super(ctx, "-thread-select", new String[]{Integer.toString(threadNum)}); //$NON-NLS-1$ this(ctx, Integer.toString(threadNum));
} }
/** /**

4
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarUpdate.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2010 QNX Software Systems and others. * Copyright (c) 2000, 2010 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
@ -35,7 +35,7 @@ public class MIVarUpdate extends MICommand<MIVarUpdateInfo> {
* @since 1.1 * @since 1.1
*/ */
public MIVarUpdate(ICommandControlDMContext dmc, String name) { public MIVarUpdate(ICommandControlDMContext dmc, String name) {
super(dmc, "-var-update", new String[] { "1" }, new String[] { name }); //$NON-NLS-1$//$NON-NLS-2$ super(dmc, "-var-update", new String[] { "1", name }); //$NON-NLS-1$//$NON-NLS-2$
} }
@Override @Override