Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikhail Khodjaiants2006-03-27 20:34:02 +0000
committerMikhail Khodjaiants2006-03-27 20:34:02 +0000
commit1018fe85a99c3e8f132b5ad6d41b38d6255d9aa5 (patch)
treeb7764ae77352608f75c784335be53f1a4b7baea7 /launch/org.eclipse.cdt.launch
parent6d80cc5d005f6269d52d56aa1263580d0e8a1b03 (diff)
downloadorg.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')
-rw-r--r--launch/org.eclipse.cdt.launch/ChangeLog5
-rw-r--r--launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java5
-rw-r--r--launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java5
3 files changed, 13 insertions, 2 deletions
diff --git a/launch/org.eclipse.cdt.launch/ChangeLog b/launch/org.eclipse.cdt.launch/ChangeLog
index 59d39fd9524..58ced545125 100644
--- a/launch/org.eclipse.cdt.launch/ChangeLog
+++ b/launch/org.eclipse.cdt.launch/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-27 Mikhail Khodjaiants
+ Moved the extraction of the stop symbol to the launch.
+ * LocalCDILaunchDelegate.java
+ * LocalRunLaunchDelegate.java
+
2006-03-15 Mikhail Khodjaiants
Reversing previous changes. The existing "verifyProgramPath" method can be used.
* AbstractCLaunchDelegate.java
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 {

Back to the top