From 2a30a9aa284b0655d47d7d0cbe23bc0094b6aa7b Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Fri, 17 Mar 2006 00:11:08 +0000 Subject: [PATCH] ILaunch is added to the arguments list of "doStartSession". --- debug/org.eclipse.cdt.debug.mi.core/ChangeLog | 6 ++++++ .../eclipse/cdt/debug/mi/core/AbstractGDBCDIDebugger.java | 4 ++-- .../eclipse/cdt/debug/mi/core/CygwinGDBCDIDebugger2.java | 7 ++++--- .../src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger2.java | 5 +++-- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog index 3a4596cbd7d..123c1638f5c 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog @@ -1,3 +1,9 @@ +2006-03-16 Mikhail Khodjaiants + ILaunch is added to the arguments list of "doStartSession". + * AbstractGDBCDIDebugger.java + * CygwinGDBCDIDebugger2.java + * GDBCDIDebugger2.java + 2006-03-13 Mikhail Khodjaiants Added default implementation for "getExtraArguments". No need to force clients to implement this method. diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/AbstractGDBCDIDebugger.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/AbstractGDBCDIDebugger.java index e76182cd798..871626b3ab9 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/AbstractGDBCDIDebugger.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/AbstractGDBCDIDebugger.java @@ -79,7 +79,7 @@ abstract public class AbstractGDBCDIDebugger implements ICDIDebugger2 { } } try { - doStartSession( config, session, monitor ); + doStartSession( launch, config, session, monitor ); } catch( CoreException e ) { failed = true; @@ -130,7 +130,7 @@ abstract public class AbstractGDBCDIDebugger implements ICDIDebugger2 { abstract protected CommandFactory getCommandFactory( ILaunchConfiguration config ) throws CoreException; - protected void doStartSession( ILaunchConfiguration config, Session session, IProgressMonitor monitor ) throws CoreException { + protected void doStartSession( ILaunch launch, ILaunchConfiguration config, Session session, IProgressMonitor monitor ) throws CoreException { } protected String renderDebuggerProcessLabel( ILaunchConfiguration config ) { diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinGDBCDIDebugger2.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinGDBCDIDebugger2.java index 52efc4b11c2..3e192109be8 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinGDBCDIDebugger2.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/CygwinGDBCDIDebugger2.java @@ -17,6 +17,7 @@ import org.eclipse.cdt.debug.mi.core.command.factories.win32.CygwinCommandFactor import org.eclipse.cdt.debug.mi.core.output.MIInfo; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.ILaunchConfiguration; /** @@ -32,9 +33,9 @@ public class CygwinGDBCDIDebugger2 extends GDBCDIDebugger2 { } /* (non-Javadoc) - * @see org.eclipse.cdt.debug.mi.core.GDBCDIDebugger2#doStartSession(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.cdt.debug.mi.core.cdi.Session, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.cdt.debug.mi.core.GDBCDIDebugger2#doStartSession(org.eclipse.debug.core.ILaunch, org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.cdt.debug.mi.core.cdi.Session, org.eclipse.core.runtime.IProgressMonitor) */ - protected void doStartSession( ILaunchConfiguration config, Session session, IProgressMonitor monitor ) throws CoreException { + protected void doStartSession( ILaunch launch, ILaunchConfiguration config, Session session, IProgressMonitor monitor ) throws CoreException { // For windows we need to start the inferior in a new console window // to separate the Inferior std{in,out,err} from gdb std{in,out,err} MISession miSession = getMISession( session ); @@ -51,7 +52,7 @@ public class CygwinGDBCDIDebugger2 extends GDBCDIDebugger2 { // We ignore this exception, for example // on GNU/Linux the new-console is an error. } - super.doStartSession( config, session, monitor ); + super.doStartSession( launch, config, session, monitor ); } /* (non-Javadoc) diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger2.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger2.java index d2375a309c5..daec61efc0e 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger2.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger2.java @@ -31,6 +31,7 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Path; +import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.ILaunchConfiguration; /** @@ -96,9 +97,9 @@ public class GDBCDIDebugger2 extends AbstractGDBCDIDebugger { } /* (non-Javadoc) - * @see org.eclipse.cdt.debug.mi.core.AbstractGDBCDIDebugger#doStartSession(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.cdt.debug.mi.core.cdi.Session, org.eclipse.core.runtime.IProgressMonitor) + * @see org.eclipse.cdt.debug.mi.core.AbstractGDBCDIDebugger#doStartSession(org.eclipse.debug.core.ILaunch, org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.cdt.debug.mi.core.cdi.Session, org.eclipse.core.runtime.IProgressMonitor) */ - protected void doStartSession( ILaunchConfiguration config, Session session, IProgressMonitor monitor ) throws CoreException { + protected void doStartSession( ILaunch launch, ILaunchConfiguration config, Session session, IProgressMonitor monitor ) throws CoreException { initializeLibraries( config, session ); if ( monitor.isCanceled() ) { throw new OperationCanceledException();