cdt/cdt_6_0_x/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java
changeset 50 fcb77f9783d2
parent 49 e82f98a34bed
child 51 49c226a8748e
equal deleted inserted replaced
49:e82f98a34bed 50:fcb77f9783d2
   491 		fProjText.setText(projectName);
   491 		fProjText.setText(projectName);
   492 		updateBuildConfigCombo(configName);		
   492 		updateBuildConfigCombo(configName);		
   493 	}
   493 	}
   494 
   494 
   495 	protected void updateProgramFromConfig(ILaunchConfiguration config) {
   495 	protected void updateProgramFromConfig(ILaunchConfiguration config) {
   496 		String programName = EMPTY_STRING;
   496 		if (fProgText != null)
   497 		try {
   497 		{
   498 			programName = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, EMPTY_STRING);
   498 			String programName = EMPTY_STRING;
   499 		} catch (CoreException ce) {
   499 			try {
   500 			LaunchUIPlugin.log(ce);
   500 				programName = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, EMPTY_STRING);
   501 		}
   501 			} catch (CoreException ce) {
   502 		fProgText.setText(programName);
   502 				LaunchUIPlugin.log(ce);
       
   503 			}
       
   504 			fProgText.setText(programName);
       
   505 		}
   503 	}
   506 	}
   504 
   507 
   505 	/** @since 6.0 */
   508 	/** @since 6.0 */
   506 	protected void updateCoreFromConfig(ILaunchConfiguration config) {
   509 	protected void updateCoreFromConfig(ILaunchConfiguration config) {
   507 		if (fCoreText != null) {
   510 		if (fCoreText != null) {
   544 			// the user typed in a non-existent project name.  Ensure that
   547 			// the user typed in a non-existent project name.  Ensure that
   545 			// won't be suppressed from the dialog.  This matches JDT behaviour
   548 			// won't be suppressed from the dialog.  This matches JDT behaviour
   546 			config.setMappedResources(null);
   549 			config.setMappedResources(null);
   547 		}
   550 		}
   548 		config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, fProjText.getText());
   551 		config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, fProjText.getText());
   549 		config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_BUILD_CONFIG_ID, (String)fBuildConfigCombo.getData(Integer.toString(fBuildConfigCombo.getSelectionIndex())));
   552 		if (fBuildConfigCombo != null) {
   550 		config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, fProgText.getText());
   553 			config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_BUILD_CONFIG_ID, (String)fBuildConfigCombo.getData(Integer.toString(fBuildConfigCombo.getSelectionIndex())));
       
   554 		}
       
   555 		if (fProgText != null) {
       
   556 			config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, fProgText.getText());
       
   557 		}
   551 		if (fCoreText != null) {
   558 		if (fCoreText != null) {
   552 			config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_COREFILE_PATH, fCoreText.getText());
   559 			config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_COREFILE_PATH, fCoreText.getText());
   553 		}
   560 		}
   554 		if (fTerminalButton != null) {
   561 		if (fTerminalButton != null) {
   555 			config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_USE_TERMINAL, fTerminalButton.getSelection());
   562 			config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_USE_TERMINAL, fTerminalButton.getSelection());