Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/launch
diff options
context:
space:
mode:
authorAlain Magloire2004-10-17 17:27:40 -0400
committerAlain Magloire2004-10-17 17:27:40 -0400
commit6bc057c303e8ae81dc926cedc54fd3be3f3a31fb (patch)
treeafbdd9183aa7af78396dfc96b0d5f25cc1e3f785 /launch
parentfea4e251847fb1d60ecdd190879e69e899124cf7 (diff)
downloadorg.eclipse.cdt-6bc057c303e8ae81dc926cedc54fd3be3f3a31fb.tar.gz
org.eclipse.cdt-6bc057c303e8ae81dc926cedc54fd3be3f3a31fb.tar.xz
org.eclipse.cdt-6bc057c303e8ae81dc926cedc54fd3be3f3a31fb.zip
2004-10-17 Alain Magloire
Remove deprecated method in CDI adjust the implementation. * src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java * src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java
Diffstat (limited to 'launch')
-rw-r--r--launch/org.eclipse.cdt.launch/ChangeLog5
-rw-r--r--launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java18
-rw-r--r--launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java46
3 files changed, 41 insertions, 28 deletions
diff --git a/launch/org.eclipse.cdt.launch/ChangeLog b/launch/org.eclipse.cdt.launch/ChangeLog
index fb90665ccf8..5feba40be14 100644
--- a/launch/org.eclipse.cdt.launch/ChangeLog
+++ b/launch/org.eclipse.cdt.launch/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-17 Alain Magloire
+ Remove deprecated method in CDI adjust the implementation.
+ * src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java
+ * src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java
+
2004-10-08 Mikhail Khodjaiants
Added the launch configuration preference for the register bookkeeping.
* LaunchUIPluginResources.properties
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java
index 8854df185c3..ba6ed607f6d 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java
@@ -16,6 +16,7 @@ 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.ICDISession;
+import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;
import org.eclipse.cdt.launch.AbstractCLaunchDelegate;
import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin;
import org.eclipse.core.resources.IFile;
@@ -77,14 +78,15 @@ public class CoreFileLaunchDelegate extends AbstractCLaunchDelegate {
}
// set the source locator
setSourceLocator(launch, config);
-
- CDIDebugModel.newCoreFileDebugTarget(
- launch,
- dsession.getCurrentTarget(),
- renderTargetLabel(debugConfig),
- debuggerProcess,
- exeFile);
-
+ ICDITarget[] dTargets = dsession.getTargets();
+ for (int i = 0; i < dTargets.length; ++i) {
+ CDIDebugModel.newCoreFileDebugTarget(
+ launch,
+ dTargets[i],
+ renderTargetLabel(debugConfig),
+ debuggerProcess,
+ exeFile);
+ }
monitor.done();
}
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java
index e2dba009800..ca54c5eca5e 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java
@@ -94,24 +94,27 @@ public class LocalCLaunchConfigurationDelegate extends AbstractCLaunchDelegate {
opt.setWorkingDirectory(wd.getAbsolutePath());
}
opt.setEnvironment(expandEnvironment(config));
- ICDITarget dtarget = dsession.getTargets()[0];
- Process process = dtarget.getProcess();
- IProcess iprocess = DebugPlugin.newProcess(launch, process, renderProcessLabel(commandArray[0]));
debugger = dsession.getSessionProcess();
if ( debugger != null ) {
debuggerProcess = DebugPlugin.newProcess(launch, debugger, renderDebuggerProcessLabel());
}
- boolean stopInMain = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, false);
- CDIDebugModel.newDebugTarget(
- launch,
- dsession.getCurrentTarget(),
- renderTargetLabel(debugConfig),
- iprocess,
- debuggerProcess,
- exeFile,
- true,
- false,
- stopInMain);
+ ICDITarget[] dtargets = dsession.getTargets();
+ for (int i = 0; i < dtargets.length; ++i) {
+ ICDITarget dtarget = dtargets[i];
+ Process process = dtarget.getProcess();
+ IProcess iprocess = DebugPlugin.newProcess(launch, process, renderProcessLabel(commandArray[0]));
+ boolean stopInMain = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, false);
+ CDIDebugModel.newDebugTarget(
+ launch,
+ dtarget,
+ renderTargetLabel(debugConfig),
+ iprocess,
+ debuggerProcess,
+ exeFile,
+ true,
+ false,
+ stopInMain);
+ }
} else if (debugMode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH)) {
int pid = getProcessID();
@@ -124,12 +127,15 @@ public class LocalCLaunchConfigurationDelegate extends AbstractCLaunchDelegate {
debuggerProcess = DebugPlugin.newProcess(launch, debugger, renderDebuggerProcessLabel());
launch.removeProcess(debuggerProcess);
}
- CDIDebugModel.newAttachDebugTarget(
- launch,
- dsession.getCurrentTarget(),
- renderTargetLabel(debugConfig),
- debuggerProcess,
- exeFile);
+ ICDITarget[] dTargets = dsession.getTargets();
+ for (int i = 0; i < dTargets.length; ++i) {
+ CDIDebugModel.newAttachDebugTarget(
+ launch,
+ dTargets[i],
+ renderTargetLabel(debugConfig),
+ debuggerProcess,
+ exeFile);
+ }
}
} catch (CDIException e) {
if (dsession != null) {

Back to the top