diff options
| author | Mikhail Khodjaiants | 2006-03-27 20:34:02 +0000 |
|---|---|---|
| committer | Mikhail Khodjaiants | 2006-03-27 20:34:02 +0000 |
| commit | 1018fe85a99c3e8f132b5ad6d41b38d6255d9aa5 (patch) | |
| tree | b7764ae77352608f75c784335be53f1a4b7baea7 /launch/org.eclipse.cdt.launch/src | |
| parent | 6d80cc5d005f6269d52d56aa1263580d0e8a1b03 (diff) | |
| download | org.eclipse.cdt-1018fe85a99c3e8f132b5ad6d41b38d6255d9aa5.tar.gz org.eclipse.cdt-1018fe85a99c3e8f132b5ad6d41b38d6255d9aa5.tar.xz org.eclipse.cdt-1018fe85a99c3e8f132b5ad6d41b38d6255d9aa5.zip | |
Moved the extraction of the stop symbol to the launch.
Diffstat (limited to 'launch/org.eclipse.cdt.launch/src')
2 files changed, 8 insertions, 2 deletions
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java index a48069a9311..5f554c99862 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java @@ -142,6 +142,9 @@ public class LocalCDILaunchDelegate extends AbstractCLaunchDelegate { monitor.worked( 1 ); boolean stopInMain = config.getAttribute( ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, false ); + String stopSymbol = null; + if ( stopInMain ) + stopSymbol = launch.getLaunchConfiguration().getAttribute( ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN_SYMBOL, ICDTLaunchConfigurationConstants.DEBUGGER_STOP_AT_MAIN_SYMBOL_DEFAULT ); ICDITarget[] targets = dsession.getTargets(); for( int i = 0; i < targets.length; i++ ) { Process process = targets[i].getProcess(); @@ -149,7 +152,7 @@ public class LocalCDILaunchDelegate extends AbstractCLaunchDelegate { if ( process != null ) { iprocess = DebugPlugin.newProcess( launch, process, renderProcessLabel( exePath.toOSString() ), getDefaultProcessMap() ); } - CDIDebugModel.newDebugTarget( launch, project.getProject(), targets[i], renderTargetLabel( debugConfig ), iprocess, exeFile, true, false, stopInMain, true ); + CDIDebugModel.newDebugTarget( launch, project.getProject(), targets[i], renderTargetLabel( debugConfig ), iprocess, exeFile, true, false, stopSymbol, true ); } } catch( CoreException e ) { 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 0555d2db4d6..286b453af18 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 @@ -96,6 +96,9 @@ public class LocalRunLaunchDelegate extends AbstractCLaunchDelegate { monitor.worked(1); boolean stopInMain = config .getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, false); + String stopSymbol = null; + if ( stopInMain ) + stopSymbol = launch.getLaunchConfiguration().getAttribute( ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN_SYMBOL, ICDTLaunchConfigurationConstants.DEBUGGER_STOP_AT_MAIN_SYMBOL_DEFAULT ); ICDITarget[] targets = dsession.getTargets(); for (int i = 0; i < targets.length; i++) { @@ -105,7 +108,7 @@ public class LocalRunLaunchDelegate extends AbstractCLaunchDelegate { iprocess = DebugPlugin.newProcess(launch, process, renderProcessLabel(exePath.toOSString()), getDefaultProcessMap()); } CDIDebugModel.newDebugTarget(launch, project.getProject(), targets[i], renderTargetLabel(debugConfig), - iprocess, exeFile, true, false, stopInMain, true); + iprocess, exeFile, true, false, stopSymbol, true); } } catch (CoreException e) { try { |