From 6d3ca105fc7747b24432dcda13a5ab84c77bc292 Mon Sep 17 00:00:00 2001 From: Alena Laskavaia Date: Mon, 18 Jan 2016 12:14:48 -0500 Subject: [PATCH] debug main tab: move build initialization out of updateProjectFromConfig - initialization of some parts were in weird places, which won't allow properly overload it. Move build config initialization into updateBuildOptionFromConfig from updateProjectFromConfig Change-Id: I7eebe24da963b14de4eec48df27817a9820977fd --- .../eclipse/cdt/launch/ui/CAbstractMainTab.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CAbstractMainTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CAbstractMainTab.java index 875701eb812..dd54527c1a5 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CAbstractMainTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CAbstractMainTab.java @@ -402,8 +402,18 @@ public abstract class CAbstractMainTab extends CLaunchConfigurationTab { } catch (CoreException e) { LaunchUIPlugin.log(e); } - if (configAuto) + if (configAuto) { updateBuildConfigCombo(AUTO_CONFIG); + } else { + String configName = EMPTY_STRING; + try { + configName = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_BUILD_CONFIG_ID, + configName); + } catch (CoreException ce) { + LaunchUIPlugin.log(ce); + } + updateBuildConfigCombo(configName); + } updateComboTooltip(); if (fDisableBuildButton != null) fDisableBuildButton @@ -578,16 +588,13 @@ public abstract class CAbstractMainTab extends CLaunchConfigurationTab { protected void updateProjectFromConfig(ILaunchConfiguration config) { String projectName = EMPTY_STRING; - String configName = EMPTY_STRING; try { projectName = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, EMPTY_STRING); - configName = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_BUILD_CONFIG_ID, EMPTY_STRING); } catch (CoreException ce) { LaunchUIPlugin.log(ce); } if (!fProjText.getText().equals(projectName)) fProjText.setText(projectName); - updateBuildConfigCombo(configName); } protected void updateProgramFromConfig(ILaunchConfiguration config) {