From 1f3df7b1c73404b4afd8996726852d867ddb3d19 Mon Sep 17 00:00:00 2001
From: Alain Magloire <alain@qnx.com>
Date: Mon, 18 Oct 2004 23:13:28 +0000
Subject: [PATCH] 2004-10-18 Alain Magloire 	Adjust to changes in CDI 
 * src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java

---
 launch/org.eclipse.cdt.launch/ChangeLog         |  4 ++++
 .../launch/internal/LocalRunLaunchDelegate.java | 17 ++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/launch/org.eclipse.cdt.launch/ChangeLog b/launch/org.eclipse.cdt.launch/ChangeLog
index 47f411bf81e..7b62c72d096 100644
--- a/launch/org.eclipse.cdt.launch/ChangeLog
+++ b/launch/org.eclipse.cdt.launch/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-18 Alain Magloire
+	Adjust to changes in CDI
+	* src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java
+
 2004-10-18 David Inglis
 	
 	Update to new ICDIDebugger interface deprecating old
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java
index 4c48ba7516d..c16500633aa 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java
@@ -21,8 +21,8 @@ import org.eclipse.cdt.debug.core.CDIDebugModel;
 import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.debug.core.ICDebugConfiguration;
 import org.eclipse.cdt.debug.core.cdi.CDIException;
-import org.eclipse.cdt.debug.core.cdi.ICDIRuntimeOptions;
 import org.eclipse.cdt.debug.core.cdi.ICDISession;
+import org.eclipse.cdt.debug.core.cdi.model.ICDIRuntimeOptions;
 import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;
 import org.eclipse.cdt.launch.AbstractCLaunchDelegate;
 import org.eclipse.cdt.launch.internal.ui.LaunchMessages;
@@ -71,13 +71,16 @@ public class LocalRunLaunchDelegate extends AbstractCLaunchDelegate {
 				if (debugMode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN)) {
 					dsession = debugConfig.createDebugger().createDebuggerSession(launch, exeFile, new SubProgressMonitor(monitor, 8));
 					try {
-						ICDIRuntimeOptions opt = dsession.getRuntimeOptions();
-						opt.setArguments(arguments);
-						File wd = getWorkingDirectory(config);
-						if (wd != null) {
-							opt.setWorkingDirectory(wd.getAbsolutePath());
+						ICDITarget[] dtargets = dsession.getTargets();
+						for (int i = 0; i < dtargets.length; ++i) {
+							ICDIRuntimeOptions opt = dtargets[i].getRuntimeOptions();
+							opt.setArguments(arguments);
+							File wd = getWorkingDirectory(config);
+							if (wd != null) {
+								opt.setWorkingDirectory(wd.getAbsolutePath());
+							}
+							opt.setEnvironment(expandEnvironment(config));
 						}
-						opt.setEnvironment(expandEnvironment(config));
 					} catch (CDIException e) {
 						try {
 							dsession.terminate();