Attachment 160935 Details for Bug 304618 – Final fix

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

[patch] Final fix

zpatch.txt (text/plain), 12.00 KB, created by Marc Khouzam

on 2010-03-04 08:59:58 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Khouzam

Created: 2010-03-04 08:59:58 EST

Size: 12.00 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.dsf.gdb
>Index: src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java,v
>retrieving revision 1.13
>diff -u -r1.13 GDBControl.java
>--- src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java	3 Mar 2010 14:35:50 -0000	1.13
>+++ src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl.java	4 Mar 2010 13:53:43 -0000
>@@ -323,7 +323,7 @@
>     		// When doing remote debugging, we use -exec-continue instead of -exec-run 
>     		execCommand = getCommandFactory().createMIExecContinue(containerDmc);
>     	} else {
>-    		execCommand = getCommandFactory().createMIExecRun(containerDmc, new String[0]);	
>+    		execCommand = getCommandFactory().createMIExecRun(containerDmc);	
>     	}
> 
>     	boolean stopInMain = false;
>Index: src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl_7_0.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl_7_0.java,v
>retrieving revision 1.15
>diff -u -r1.15 GDBControl_7_0.java
>--- src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl_7_0.java	3 Mar 2010 14:35:50 -0000	1.15
>+++ src/org/eclipse/cdt/dsf/gdb/service/command/GDBControl_7_0.java	4 Mar 2010 13:53:43 -0000
>@@ -364,7 +364,7 @@
>        	    			// When doing remote debugging, we use -exec-continue instead of -exec-run 
>        	    			fExecCommand = getCommandFactory().createMIExecContinue(fContainerDmc);
>        	    		} else {
>-       	    			fExecCommand = getCommandFactory().createMIExecRun(fContainerDmc, new String[0]);	
>+       	    			fExecCommand = getCommandFactory().createMIExecRun(fContainerDmc);	
>        	    		}
>        	    		rm.done();
>       	    	}},
>Index: src/org/eclipse/cdt/dsf/mi/service/command/commands/MIBreakAfter.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIBreakAfter.java,v
>retrieving revision 1.1
>diff -u -r1.1 MIBreakAfter.java
>--- src/org/eclipse/cdt/dsf/mi/service/command/commands/MIBreakAfter.java	8 Jan 2009 21:05:45 -0000	1.1
>+++ src/org/eclipse/cdt/dsf/mi/service/command/commands/MIBreakAfter.java	4 Mar 2010 13:53:43 -0000
>@@ -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
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -26,7 +26,6 @@
> public class MIBreakAfter extends MICommand<MIInfo>
> {
>     public MIBreakAfter(IBreakpointsTargetDMContext ctx, int breakpoint, int ignoreCount) {
>-        super(ctx, "-break-after"); //$NON-NLS-1$
>-		setParameters(new String[] { Integer.toString(breakpoint), Integer.toString(ignoreCount) });
>+        super(ctx, "-break-after", new String[] { Integer.toString(breakpoint), Integer.toString(ignoreCount) }); //$NON-NLS-1$
>     }
> }
>Index: src/org/eclipse/cdt/dsf/mi/service/command/commands/MICommand.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MICommand.java,v
>retrieving revision 1.1
>diff -u -r1.1 MICommand.java
>--- src/org/eclipse/cdt/dsf/mi/service/command/commands/MICommand.java	8 Jan 2009 21:05:45 -0000	1.1
>+++ src/org/eclipse/cdt/dsf/mi/service/command/commands/MICommand.java	4 Mar 2010 13:53:43 -0000
>@@ -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
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -48,8 +48,8 @@
>         this(ctx, operation, empty, empty);
>     }
>     
>-    public MICommand(IDMContext ctx, String operation, String[] options) {
>-        this(ctx, operation, options, empty);
>+    public MICommand(IDMContext ctx, String operation, String[] params) {
>+        this(ctx, operation, empty, params);
>     }
>     
>     public MICommand(IDMContext ctx, String operation, String[] options, String[] params) {
>Index: src/org/eclipse/cdt/dsf/mi/service/command/commands/MIEnvironmentDirectory.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIEnvironmentDirectory.java,v
>retrieving revision 1.1
>diff -u -r1.1 MIEnvironmentDirectory.java
>--- src/org/eclipse/cdt/dsf/mi/service/command/commands/MIEnvironmentDirectory.java	8 Jan 2009 21:05:45 -0000	1.1
>+++ src/org/eclipse/cdt/dsf/mi/service/command/commands/MIEnvironmentDirectory.java	4 Mar 2010 13:53:43 -0000
>@@ -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
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -25,23 +25,10 @@
> public class MIEnvironmentDirectory extends MICommand<MIInfo> {
> 	
> 	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 (paths == null) {
>-				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(new String[] {"-r"}); //$NON-NLS-1$
> 		}
>-		
>-		setOptions(options);
> 	}
> }
>\ No newline at end of file
>Index: src/org/eclipse/cdt/dsf/mi/service/command/commands/MIExecRun.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIExecRun.java,v
>retrieving revision 1.1
>diff -u -r1.1 MIExecRun.java
>--- src/org/eclipse/cdt/dsf/mi/service/command/commands/MIExecRun.java	8 Jan 2009 21:05:45 -0000	1.1
>+++ src/org/eclipse/cdt/dsf/mi/service/command/commands/MIExecRun.java	4 Mar 2010 13:53:43 -0000
>@@ -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
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -18,12 +18,14 @@
> 
> /**
>  * 
>- *      -exec-run
>+ *      -exec-run [ARGS]
>  *
>  *   Asynchronous command.  Starts execution of the inferior from the
>  * beginning.  The inferior executes until either a breakpoint is
>  * encountered or the program exits.
>  * 
>+ * ARGS will be passed to the inferior.  This option is not documented.
>+ * 
>  */
> public class MIExecRun extends MICommand<MIInfo> 
> {
>Index: src/org/eclipse/cdt/dsf/mi/service/command/commands/MIInterpreterExec.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIInterpreterExec.java,v
>retrieving revision 1.1
>diff -u -r1.1 MIInterpreterExec.java
>--- src/org/eclipse/cdt/dsf/mi/service/command/commands/MIInterpreterExec.java	8 Jan 2009 21:05:45 -0000	1.1
>+++ src/org/eclipse/cdt/dsf/mi/service/command/commands/MIInterpreterExec.java	4 Mar 2010 13:53:43 -0000
>@@ -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
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -38,7 +38,7 @@
>      * @param oper
>      */
>     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$
>     }
> 
> }
>Index: src/org/eclipse/cdt/dsf/mi/service/command/commands/MIStackSelectFrame.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIStackSelectFrame.java,v
>retrieving revision 1.2
>diff -u -r1.2 MIStackSelectFrame.java
>--- src/org/eclipse/cdt/dsf/mi/service/command/commands/MIStackSelectFrame.java	16 Feb 2010 13:51:35 -0000	1.2
>+++ src/org/eclipse/cdt/dsf/mi/service/command/commands/MIStackSelectFrame.java	4 Mar 2010 13:53:43 -0000
>@@ -26,7 +26,7 @@
> public class MIStackSelectFrame extends MICommand<MIInfo> {
> 	
> 	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
>Index: src/org/eclipse/cdt/dsf/mi/service/command/commands/MIThreadSelect.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIThreadSelect.java,v
>retrieving revision 1.3
>diff -u -r1.3 MIThreadSelect.java
>--- src/org/eclipse/cdt/dsf/mi/service/command/commands/MIThreadSelect.java	16 Feb 2010 14:01:04 -0000	1.3
>+++ src/org/eclipse/cdt/dsf/mi/service/command/commands/MIThreadSelect.java	4 Mar 2010 13:53:43 -0000
>@@ -28,7 +28,7 @@
> public class MIThreadSelect extends MICommand<MIInfo>
> {
> 	public MIThreadSelect(IDMContext ctx, int threadNum) {
>-		super(ctx, "-thread-select", new String[]{Integer.toString(threadNum)}); //$NON-NLS-1$
>+		this(ctx, Integer.toString(threadNum));
> 	}
> 	
> 	/**
>Index: src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarUpdate.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarUpdate.java,v
>retrieving revision 1.3
>diff -u -r1.3 MIVarUpdate.java
>--- src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarUpdate.java	3 Mar 2010 14:35:50 -0000	1.3
>+++ src/org/eclipse/cdt/dsf/mi/service/command/commands/MIVarUpdate.java	4 Mar 2010 13:53:43 -0000
>@@ -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
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -35,7 +35,7 @@
>      * @since 1.1
>      */
> 	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

Flags:

marc.khouzam: iplog-

Actions: View | Diff

Attachments on bug 304618: 160888 | 160935