mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 22:52:11 +02:00
Code Issues Wiki Activity

2004-10-17 Alain Magloire

Browse source 
Remove deprecated method in CDI adjust the implementation.
	* src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java
	* src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java
This commit is contained in:
Alain Magloire 2004-10-17 21:27:40 +00:00
parent fea4e25184
commit 6bc057c303
3 changed files with 41 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
launch/org.eclipse.cdt.launch/ChangeLog
View file

@ -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 2004-10-08 Mikhail Khodjaiants
Added the launch configuration preference for the register bookkeeping. Added the launch configuration preference for the register bookkeeping.
* LaunchUIPluginResources.properties * LaunchUIPluginResources.properties

8
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java
View file

@ -16,6 +16,7 @@ import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
import org.eclipse.cdt.debug.core.ICDebugConfiguration; import org.eclipse.cdt.debug.core.ICDebugConfiguration;
import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.cdi.ICDISession; 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.AbstractCLaunchDelegate;
import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin; import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin;
import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
@ -77,14 +78,15 @@ public class CoreFileLaunchDelegate extends AbstractCLaunchDelegate {
} }
// set the source locator // set the source locator
setSourceLocator(launch, config); setSourceLocator(launch, config);
ICDITarget[] dTargets = dsession.getTargets();
for (int i = 0; i < dTargets.length; ++i) {
CDIDebugModel.newCoreFileDebugTarget( CDIDebugModel.newCoreFileDebugTarget(
launch, launch,
dsession.getCurrentTarget(), dTargets[i],
renderTargetLabel(debugConfig), renderTargetLabel(debugConfig),
debuggerProcess, debuggerProcess,
exeFile); exeFile);
}
monitor.done(); monitor.done();
} }

16
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java
View file

@ -94,17 +94,19 @@ public class LocalCLaunchConfigurationDelegate extends AbstractCLaunchDelegate {
opt.setWorkingDirectory(wd.getAbsolutePath()); opt.setWorkingDirectory(wd.getAbsolutePath());
} }
opt.setEnvironment(expandEnvironment(config)); 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(); debugger = dsession.getSessionProcess();
if ( debugger != null ) { if ( debugger != null ) {
debuggerProcess = DebugPlugin.newProcess(launch, debugger, renderDebuggerProcessLabel()); debuggerProcess = DebugPlugin.newProcess(launch, debugger, renderDebuggerProcessLabel());
} }
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); boolean stopInMain = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, false);
CDIDebugModel.newDebugTarget( CDIDebugModel.newDebugTarget(
launch, launch,
dsession.getCurrentTarget(), dtarget,
renderTargetLabel(debugConfig), renderTargetLabel(debugConfig),
iprocess, iprocess,
debuggerProcess, debuggerProcess,
@ -112,6 +114,7 @@ public class LocalCLaunchConfigurationDelegate extends AbstractCLaunchDelegate {
true, true,
false, false,
stopInMain); stopInMain);
}
} else if (debugMode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH)) { } else if (debugMode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH)) {
int pid = getProcessID(); int pid = getProcessID();
@ -124,13 +127,16 @@ public class LocalCLaunchConfigurationDelegate extends AbstractCLaunchDelegate {
debuggerProcess = DebugPlugin.newProcess(launch, debugger, renderDebuggerProcessLabel()); debuggerProcess = DebugPlugin.newProcess(launch, debugger, renderDebuggerProcessLabel());
launch.removeProcess(debuggerProcess); launch.removeProcess(debuggerProcess);
} }
ICDITarget[] dTargets = dsession.getTargets();
for (int i = 0; i < dTargets.length; ++i) {
CDIDebugModel.newAttachDebugTarget( CDIDebugModel.newAttachDebugTarget(
launch, launch,
dsession.getCurrentTarget(), dTargets[i],
renderTargetLabel(debugConfig), renderTargetLabel(debugConfig),
debuggerProcess, debuggerProcess,
exeFile); exeFile);
} }
}
} catch (CDIException e) { } catch (CDIException e) {
if (dsession != null) { if (dsession != null) {
try { try {