mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-30 21:55:31 +02:00
Code Issues Wiki Activity

Fix for [Bug 192617] [Project Model UI]NPE in creating the new configuration for makefile projects

Browse source
This commit is contained in:
Mikhail Sennikovsky 2007-06-14 09:57:32 +00:00
parent 00b6127937
commit ed3e376742
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java
View file

@ -18,6 +18,7 @@ import org.eclipse.cdt.core.settings.model.ICProjectDescription;
import org.eclipse.cdt.core.settings.model.extension.CConfigurationData;
import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.managedbuilder.core.IManagedProject;
import org.eclipse.cdt.managedbuilder.core.IProjectType;
import org.eclipse.cdt.managedbuilder.core.IToolChain;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.managedbuilder.internal.core.Configuration;
@ -238,9 +239,10 @@ public class NewCfgDialog implements INewCfgDialog {
}
});
String[] extCfgs = getConfigNamesAndDescriptions(rcfgs, true);
realConfigSelector = new Combo(group, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER);
realConfigSelector.setFont(group.getFont());
realConfigSelector.setItems(getConfigNamesAndDescriptions(rcfgs, true));
realConfigSelector.setItems(extCfgs);
index = realConfigSelector.indexOf(newName);
realConfigSelector.select(index < 0 ? 0 : index);
gd = new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL);
@ -251,6 +253,9 @@ public class NewCfgDialog implements INewCfgDialog {
setButtons();
}
});
if(extCfgs.length == 0)
b_real.setEnabled(false);
statusLabel = new Label(composite, SWT.CENTER);
gd = new GridData(GridData.FILL_HORIZONTAL);
@ -333,10 +338,13 @@ public class NewCfgDialog implements INewCfgDialog {
IConfiguration cfg = cfgds[i];
for(; cfg != null && !cfg.isExtensionElement(); cfg = cfg.getParent());
if (cfg != null) {
IConfiguration[] cfs = cfg.getProjectType().getConfigurations();
for (int j=0; j<cfs.length; j++) {
if (cfs[j] != null && !lst.contains(cfs[j]))
lst.add(cfs[j]);
IProjectType pType = cfg.getProjectType();
if(pType != null){
IConfiguration[] cfs = pType.getConfigurations();
for (int j=0; j<cfs.length; j++) {
if (cfs[j] != null && !lst.contains(cfs[j]))
lst.add(cfs[j]);
}
}
}
}