| author | timkelly |
| Thu, 06 Aug 2009 12:19:08 -0500 | |
| changeset 54 | 89a4ce4b37f5 |
| parent 40 | eb3c938c7fef |
| permissions | -rw-r--r-- |
|
40
eb3c938c7fef
set up for custom build for logging. merged from carbide 2.1.x builds. this state is as it comes from platform. Next changelog will add the updates.
timkelly
parents:
diff
changeset
|
1 |
# HG changeset patch |
| 54 | 2 |
# User ryall |
3 |
# Date 1249412413 18000 |
|
4 |
# Node ID fcb77f9783d2c410f5e70d8859fd004c67d10b0c |
|
5 |
# Parent e82f98a34bed4d769138c63f4c80d8b603593126 |
|
6 |
Fix NPEs. |
|
|
40
eb3c938c7fef
set up for custom build for logging. merged from carbide 2.1.x builds. this state is as it comes from platform. Next changelog will add the updates.
timkelly
parents:
diff
changeset
|
7 |
|
| 54 | 8 |
diff -r e82f98a34bed -r fcb77f9783d2 cdt/cdt_6_0_x/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java |
9 |
--- a/cdt/cdt_6_0_x/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java Tue Aug 04 13:42:53 2009 -0500 |
|
10 |
+++ b/cdt/cdt_6_0_x/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java Tue Aug 04 14:00:13 2009 -0500 |
|
11 |
@@ -493,13 +493,16 @@ |
|
12 |
} |
|
13 |
||
14 |
protected void updateProgramFromConfig(ILaunchConfiguration config) {
|
|
15 |
- String programName = EMPTY_STRING; |
|
16 |
- try {
|
|
17 |
- programName = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, EMPTY_STRING); |
|
18 |
- } catch (CoreException ce) {
|
|
19 |
- LaunchUIPlugin.log(ce); |
|
20 |
+ if (fProgText != null) |
|
21 |
+ {
|
|
22 |
+ String programName = EMPTY_STRING; |
|
23 |
+ try {
|
|
24 |
+ programName = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, EMPTY_STRING); |
|
25 |
+ } catch (CoreException ce) {
|
|
26 |
+ LaunchUIPlugin.log(ce); |
|
27 |
+ } |
|
28 |
+ fProgText.setText(programName); |
|
29 |
} |
|
30 |
- fProgText.setText(programName); |
|
31 |
} |
|
32 |
||
33 |
/** @since 6.0 */ |
|
34 |
@@ -546,8 +549,12 @@ |
|
35 |
config.setMappedResources(null); |
|
36 |
} |
|
37 |
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, fProjText.getText()); |
|
38 |
- config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_BUILD_CONFIG_ID, (String)fBuildConfigCombo.getData(Integer.toString(fBuildConfigCombo.getSelectionIndex()))); |
|
39 |
- config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, fProgText.getText()); |
|
40 |
+ if (fBuildConfigCombo != null) {
|
|
41 |
+ config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_BUILD_CONFIG_ID, (String)fBuildConfigCombo.getData(Integer.toString(fBuildConfigCombo.getSelectionIndex()))); |
|
|
40
eb3c938c7fef
set up for custom build for logging. merged from carbide 2.1.x builds. this state is as it comes from platform. Next changelog will add the updates.
timkelly
parents:
diff
changeset
|
42 |
+ } |
| 54 | 43 |
+ if (fProgText != null) {
|
44 |
+ config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, fProgText.getText()); |
|
|
40
eb3c938c7fef
set up for custom build for logging. merged from carbide 2.1.x builds. this state is as it comes from platform. Next changelog will add the updates.
timkelly
parents:
diff
changeset
|
45 |
+ } |
| 54 | 46 |
if (fCoreText != null) {
|
47 |
config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_COREFILE_PATH, fCoreText.getText()); |
|
48 |
} |