mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug 458650 - NPE when creating a "C/C++ Remote Application" launch

Browse source 
config

Change-Id: I72f48aa4fa7b46e0d5ba5e5e8f6e4877269ea7f5
Signed-off-by: Teodor Madan <teodor.madan@freescale.com>
This commit is contained in:
Teodor Madan 2015-01-28 17:42:26 +02:00
parent d95f95521e
commit 196d978624
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2006, 2014 PalmSource, Inc. and others. * Copyright (c) 2006, 2015 PalmSource, Inc. and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -224,8 +224,6 @@ public class RemoteCDSFMainTab extends CMainTab {
handleRemoteConnectionPropertiesSelected(); handleRemoteConnectionPropertiesSelected();
} }
}); });
updateConnectionPulldown();
} }
/* /*
@ -698,7 +696,7 @@ public class RemoteCDSFMainTab extends CMainTab {
updateTargetProgFromConfig(config); updateTargetProgFromConfig(config);
updateSkipDownloadFromConfig(config); updateSkipDownloadFromConfig(config);
updateConnectionButtons(); updateConnectionPulldown();
isInitializing = false; isInitializing = false;
} }

13
launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CAbstractMainTab.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2010, 2011 Nokia Corporation and others. * Copyright (c) 2010, 2015 Nokia Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -611,12 +611,15 @@ public abstract class CAbstractMainTab extends CLaunchConfigurationTab {
*/ */
protected void updateComboTooltip() { protected void updateComboTooltip() {
if (fBuildConfigCombo != null) { if (fBuildConfigCombo != null) {
// fBuildConfigCombo might not be loaded when controls are created
String configId = (String) fBuildConfigCombo.getData(Integer.toString(fBuildConfigCombo.getSelectionIndex())); String configId = (String) fBuildConfigCombo.getData(Integer.toString(fBuildConfigCombo.getSelectionIndex()));
String tooltip = EMPTY_STRING; String tooltip = EMPTY_STRING;
if (configId.equals(AUTO_CONFIG)) { if (configId != null) {
tooltip = LaunchMessages.CMainTab_Build_Config_Auto_tooltip; if (configId.equals(AUTO_CONFIG)) {
} else if (configId.equals(EMPTY_STRING)) { tooltip = LaunchMessages.CMainTab_Build_Config_Auto_tooltip;
tooltip = LaunchMessages.CMainTab_Build_Config_Active_tooltip; } else if (configId.equals(EMPTY_STRING)) {
tooltip = LaunchMessages.CMainTab_Build_Config_Active_tooltip;
}
} }
fBuildConfigCombo.setToolTipText(tooltip); fBuildConfigCombo.setToolTipText(tooltip);
} }