Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Inglis2005-02-03 19:19:48 +0000
committerDavid Inglis2005-02-03 19:19:48 +0000
commit83c919283711d2f1d3f57768a415ea303baa6e21 (patch)
tree3bac2bcecf36f4c00edd8427f79bd6e18f961da4 /launch/org.eclipse.cdt.launch
parent1ec27ca202aa9a4b293947191f8f6c544711b25b (diff)
downloadorg.eclipse.cdt-83c919283711d2f1d3f57768a415ea303baa6e21.tar.gz
org.eclipse.cdt-83c919283711d2f1d3f57768a415ea303baa6e21.tar.xz
org.eclipse.cdt-83c919283711d2f1d3f57768a415ea303baa6e21.zip
Fixed PR#84361
Diffstat (limited to 'launch/org.eclipse.cdt.launch')
-rw-r--r--launch/org.eclipse.cdt.launch/ChangeLog6
-rw-r--r--launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/AbstractCDebuggerTab.java1
-rw-r--r--launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CoreFileDebuggerTab.java16
3 files changed, 22 insertions, 1 deletions
diff --git a/launch/org.eclipse.cdt.launch/ChangeLog b/launch/org.eclipse.cdt.launch/ChangeLog
index 89f3405c2c7..2875960d606 100644
--- a/launch/org.eclipse.cdt.launch/ChangeLog
+++ b/launch/org.eclipse.cdt.launch/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-03 David Inglis
+ Fixed PR#84361
+
+ * src/org/elipse/cdt/launch/internal/ui/AbstractCDebuggerTab.java
+ * src/org/eclipse/cdt/launch/ui/CoreFileDebuggerTab.java
+
2005-01-19 Alain Magloire
PR 82930
* src/org/eclipse/cdt/launch/internal/CPropertyTester.java
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/AbstractCDebuggerTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/AbstractCDebuggerTab.java
index ae1fe4d5837..bab928e7342 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/AbstractCDebuggerTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/AbstractCDebuggerTab.java
@@ -137,7 +137,6 @@ public abstract class AbstractCDebuggerTab extends CLaunchConfigurationTab {
setInitializeDefault(false);
getDynamicTab().initializeFrom(wc);
}
- updateLaunchConfigurationDialog();
}
/**
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CoreFileDebuggerTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CoreFileDebuggerTab.java
index fd60d393a4d..fa5bdaf684e 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CoreFileDebuggerTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CoreFileDebuggerTab.java
@@ -84,6 +84,21 @@ public class CoreFileDebuggerTab extends AbstractCDebuggerTab {
setInitializing(false);
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.cdt.launch.internal.ui.AbstractCDebuggerTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
+ */
+ public void activated(ILaunchConfigurationWorkingCopy workingCopy) {
+ setInitializing(true);
+ try {
+ String id = workingCopy.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ID, ""); //$NON-NLS-1$
+ loadDebuggerComboBox(workingCopy, id);
+ } catch (CoreException e) {
+ }
+ setInitializing(false);
+ super.activated(workingCopy);
+ }
+
public boolean isValid(ILaunchConfiguration config) {
if (!validateDebuggerConfig(config)) {
return false;
@@ -106,6 +121,7 @@ public class CoreFileDebuggerTab extends AbstractCDebuggerTab {
}
return true;
}
+
protected void loadDebuggerComboBox(ILaunchConfiguration config, String selection) {
ICDebugConfiguration[] debugConfigs = CDebugCorePlugin.getDefault().getDebugConfigurations();
String projectPlatform = getProjectPlatform(config);

Back to the top