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 # 233432 : NPE AbstractPage.getResDesc(...) on Pressing Apply having created new configuration

Browse source
This commit is contained in:
Oleg Krasilnikov 2008-05-29 10:31:51 +00:00
parent 8737024fef
commit ec0bfbda3a
2 changed files with 39 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java
View file

@ -58,6 +58,7 @@ import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.TabFolder;
import org.eclipse.swt.widgets.TabItem;
@ -460,6 +461,40 @@ implements
return performSave(SAVE_MODE_OK);
}
/**
* Searches in the prj for the config description with the same ID as for given cfg.
* If there's no such cfgd, it will be created.
*
* @param prj - project description where we'll search (or create) config description
* @param cfg - config description belonging to another project description,
* it is a sample for search and base for possile creation
* of resulting configuration description.
*
* @return the configuration description (found or created) or null in case of error
*/
private ICConfigurationDescription findCfg(ICProjectDescription prj, ICConfigurationDescription cfg) {
String id = cfg.getId();
// find config with the same ID as original one
ICConfigurationDescription c = prj.getConfigurationById(id);
// if there's no cfg found, try to create it
if (c == null) {
try {
c = prj.createConfiguration(id, cfg.getName(), cfg);
c.setDescription(cfg.getDescription());
} catch (CoreException e) {
/* do nothing: c is already null */
}
}
// if creation failed, report an error and return null
if (c == null) {
MessageBox mb = new MessageBox(getShell());
mb.setMessage(UIMessages.getString("AbstractPage.3")); //$NON-NLS-1$
mb.open();
}
return c;
}
/**
* The same code used to perform OK and Apply
*/
@ -482,7 +517,9 @@ implements
}
lc = MultiItemsHolder.createRDescription(rds);
} else {
ICConfigurationDescription c = local_prjd.getConfigurationById(resd.getConfiguration().getId());
ICConfigurationDescription c = findCfg(local_prjd, resd.getConfiguration());
if (c == null)
return false; // cannot save: no cfg found
lc = getResDesc(c);
}
}

1
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties
View file

@ -342,6 +342,7 @@ AbstractPage.13=Cannot load
AbstractPage.14=Cannot create page:
AbstractPage.15=element not initialized.
AbstractPage.2=This project is not a CDT project
AbstractPage.3=Error while accessing new configuration. <Apply> cannot work. Use <OK>.
AbstractPage.4=[ All configurations ]
AbstractPage.5=[ Multiple configurations...]
AbstractPage.6=Configuration: