Attachment 189312 Details for Bug 337602 – Fix

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

[patch] Fix

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

on 2011-02-18 14:38:22 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Khouzam

Created: 2011-02-18 14:38:22 EST

Size: 6.75 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.debug.gdbjtag.core
>Index: src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java,v
>retrieving revision 1.12
>diff -u -r1.12 GDBJtagDSFFinalLaunchSequence.java
>--- src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java	5 Feb 2011 04:27:32 -0000	1.12
>+++ src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java	18 Feb 2011 19:34:40 -0000
>@@ -51,6 +51,7 @@
> import org.eclipse.cdt.dsf.mi.service.IMIContainerDMContext;
> import org.eclipse.cdt.dsf.mi.service.IMIProcesses;
> import org.eclipse.cdt.dsf.mi.service.MIBreakpointsManager;
>+import org.eclipse.cdt.dsf.mi.service.MIProcesses;
> import org.eclipse.cdt.dsf.mi.service.command.CommandFactory;
> import org.eclipse.cdt.dsf.mi.service.command.commands.CLICommand;
> import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
>@@ -212,8 +213,10 @@
>         			String args = fGDBBackend.getProgramArguments();
>         			
>             		if (args != null) {
>+        				String[] argArray = args.replaceAll("\n", " ").split(" ");  //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
>+        				IMIContainerDMContext containerDmc = fProcService.createContainerContextFromGroupId(fCommandControl.getContext(), MIProcesses.UNIQUE_GROUP_ID);
>             			fCommandControl.queueCommand(
>-            					fCommandFactory.createMIGDBSetArgs(fCommandControl.getContext(), args), 
>+            					fCommandFactory.createMIGDBSetArgs(containerDmc, argArray), 
>             					new DataRequestMonitor<MIInfo>(getExecutor(), requestMonitor));
>             		} else {
>             			requestMonitor.done();
>#P org.eclipse.cdt.dsf.gdb
>Index: src/org/eclipse/cdt/dsf/gdb/service/DebugNewProcessSequence.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/DebugNewProcessSequence.java,v
>retrieving revision 1.2
>diff -u -r1.2 DebugNewProcessSequence.java
>--- src/org/eclipse/cdt/dsf/gdb/service/DebugNewProcessSequence.java	16 Feb 2011 11:39:41 -0000	1.2
>+++ src/org/eclipse/cdt/dsf/gdb/service/DebugNewProcessSequence.java	18 Feb 2011 19:34:40 -0000
>@@ -183,9 +183,9 @@
> 			String args = fBackend.getProgramArguments();
> 
> 			if (args != null) {
>+				String[] argArray = args.replaceAll("\n", " ").split(" ");  //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
> 				fCommandControl.queueCommand(
>-						// here we need to pass the proper container context
>-						fCommandFactory.createMIGDBSetArgs(fCommandControl.getContext(), args), 
>+						fCommandFactory.createMIGDBSetArgs(getContainerContext(), argArray), 
> 						new DataRequestMonitor<MIInfo>(ImmediateExecutor.getInstance(), rm));
> 			} else {
> 				rm.done();
>Index: src/org/eclipse/cdt/dsf/mi/service/command/CommandFactory.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/CommandFactory.java,v
>retrieving revision 1.19
>diff -u -r1.19 CommandFactory.java
>--- src/org/eclipse/cdt/dsf/mi/service/command/CommandFactory.java	16 Dec 2010 03:13:31 -0000	1.19
>+++ src/org/eclipse/cdt/dsf/mi/service/command/CommandFactory.java	18 Feb 2011 19:34:40 -0000
>@@ -527,16 +527,6 @@
> 		return new MIExecUntil(dmc, loc);
> 	}
> 
>-	@Deprecated
>-	public ICommand<MIInfo> createMIFileExecAndSymbols(ICommandControlDMContext dmc, String file) {
>-		return new MIFileExecAndSymbols(dmc, file);
>-	}
>-
>-	@Deprecated
>-	public ICommand<MIInfo> createMIFileExecAndSymbols(ICommandControlDMContext dmc) {
>-		return new MIFileExecAndSymbols(dmc);
>-	}
>-
> 	/**  @since 4.0 */
> 	public ICommand<MIInfo> createMIFileExecAndSymbols(IMIContainerDMContext dmc, String file) {
> 		return new MIFileExecAndSymbols(dmc, file);
>@@ -571,16 +561,13 @@
> 		return new MIGDBSet(ctx, params);
> 	}
> 
>-	public ICommand<MIInfo> createMIGDBSetArgs(ICommandControlDMContext dmc) {
>+	/** @since 4.0 */
>+	public ICommand<MIInfo> createMIGDBSetArgs(IMIContainerDMContext dmc) {
> 		return new MIGDBSetArgs(dmc);
> 	}
> 
>-	public ICommand<MIInfo> createMIGDBSetArgs(ICommandControlDMContext dmc, String arguments) {
>-		return new MIGDBSetArgs(dmc, arguments);
>-	}
>-
> 	/** @since 4.0 */
>-	public ICommand<MIInfo> createMIGDBSetArgs(ICommandControlDMContext dmc, String[] arguments) {
>+	public ICommand<MIInfo> createMIGDBSetArgs(IMIContainerDMContext dmc, String[] arguments) {
> 		return new MIGDBSetArgs(dmc, arguments);
> 	}
> 	
>Index: src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetArgs.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetArgs.java,v
>retrieving revision 1.4
>diff -u -r1.4 MIGDBSetArgs.java
>--- src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetArgs.java	30 Nov 2010 01:10:06 -0000	1.4
>+++ src/org/eclipse/cdt/dsf/mi/service/command/commands/MIGDBSetArgs.java	18 Feb 2011 19:34:40 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008, 2009 Ericsson and others.
>+ * Copyright (c) 2008, 2011 Ericsson and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -12,7 +12,7 @@
> 
> package org.eclipse.cdt.dsf.mi.service.command.commands;
> 
>-import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext;
>+import org.eclipse.cdt.dsf.mi.service.IMIContainerDMContext;
> 
> /**
>  *      -gdb-set args ARGS
>@@ -21,14 +21,14 @@
>  * @since 1.1
>  */
> public class MIGDBSetArgs extends MIGDBSet {
>-    public MIGDBSetArgs(ICommandControlDMContext dmc) {
>+
>+    /** @since 4.0 */
>+	public MIGDBSetArgs(IMIContainerDMContext dmc) {
>         this(dmc, new String[0]);
>     }
> 
>-    /**
>-	 * @since 4.0
>-	 */
>-    public MIGDBSetArgs(ICommandControlDMContext dmc, String[] arguments) {
>+    /** @since 4.0 */
>+    public MIGDBSetArgs(IMIContainerDMContext dmc, String[] arguments) {
>         super(dmc, null);
> 
>     	String[] cmdArray = new String[arguments.length + 1];
>@@ -38,12 +38,4 @@
>     	}
>     	setParameters(cmdArray);
>     }
>-
>-    /**
>-     * @deprecated Use MIGDBSetArgs(ICommandControlDMContext, String[]) instead.
>-     */
>-    @Deprecated
>-    public MIGDBSetArgs(ICommandControlDMContext dmc, String arguments) {
>-        this(dmc, arguments.replaceAll("\n", " ").split(" ")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
>-    }
> }

Flags:

marc.khouzam: iplog-

Actions: View | Diff

Attachments on bug 337602: 189312