1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 18:26:01 +02:00

Discovery profile filtering added

This commit is contained in:
Oleg Krasilnikov 2007-03-16 10:35:18 +00:00
parent bbd2239f57
commit d31413d1fd

View file

@ -81,7 +81,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
private ICfgScannerConfigBuilderInfo2Set cbi; private ICfgScannerConfigBuilderInfo2Set cbi;
private IScannerConfigBuilderInfo2 buildInfo; private IScannerConfigBuilderInfo2 buildInfo;
private CfgInfoContext icontext; private CfgInfoContext iContext;
private List pagesList = null; private List pagesList = null;
private List profilesList = null; private List profilesList = null;
private IPath configPath; private IPath configPath;
@ -204,7 +204,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
IResourceInfo rci = ic.getResourceInfo(); IResourceInfo rci = ic.getResourceInfo();
if (rci == null) { // per configuration if (rci == null) { // per configuration
s = ic.getConfiguration().getName(); s = ic.getConfiguration().getName();
} else { // pre resource } else { // per resource
if ( ! configPath.equals(rci.getPath())) continue; if ( ! configPath.equals(rci.getPath())) continue;
IInputType typ = ic.getInputType(); IInputType typ = ic.getInputType();
if (typ != null) s = typ.getName(); if (typ != null) s = typ.getName();
@ -249,7 +249,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
TableItem ti = resTable.getSelection()[0]; TableItem ti = resTable.getSelection()[0];
buildInfo = (IScannerConfigBuilderInfo2)ti.getData("info"); //$NON-NLS-1$ buildInfo = (IScannerConfigBuilderInfo2)ti.getData("info"); //$NON-NLS-1$
icontext = (CfgInfoContext)ti.getData("cont"); //$NON-NLS-1$ iContext = (CfgInfoContext)ti.getData("cont"); //$NON-NLS-1$
scEnabledButton.setSelection(buildInfo.isAutoDiscoveryEnabled()); scEnabledButton.setSelection(buildInfo.isAutoDiscoveryEnabled());
scProblemReportingEnabledButton.setSelection(buildInfo.isProblemReportingEnabled()); scProblemReportingEnabledButton.setSelection(buildInfo.isProblemReportingEnabled());
@ -267,6 +267,8 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
while (it.hasNext()) { while (it.hasNext()) {
String profileId = (String)it.next(); String profileId = (String)it.next();
if (!cbi.isProfileSupported(iContext, profileId)) continue;
String profileName = getProfileName(profileId); String profileName = getProfileName(profileId);
profileComboBox.add(profileName); profileComboBox.add(profileName);
if (profileId.equals(savedId)) pos = counter; if (profileId.equals(savedId)) pos = counter;
@ -297,7 +299,8 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
private void handleDiscoveryProfileChanged() { private void handleDiscoveryProfileChanged() {
int pos = profileComboBox.getSelectionIndex(); int pos = profileComboBox.getSelectionIndex();
for (int i=0; i<realPages.length; i++) for (int i=0; i<realPages.length; i++)
realPages[i].setVisible(i==pos); if (realPages[i] != null)
realPages[i].setVisible(i==pos);
} }
/** /**
@ -393,7 +396,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf
* IBuildInfoContainer methods - called from dynamic pages * IBuildInfoContainer methods - called from dynamic pages
*/ */
public IScannerConfigBuilderInfo2 getBuildInfo() { return buildInfo; } public IScannerConfigBuilderInfo2 getBuildInfo() { return buildInfo; }
public CfgInfoContext getContext() { return icontext; } public CfgInfoContext getContext() { return iContext; }
public IProject getProject() { return page.getProject(); } public IProject getProject() { return page.getProject(); }
public ICConfigurationDescription getConfiguration() { return getResDesc().getConfiguration(); } public ICConfigurationDescription getConfiguration() { return getResDesc().getConfiguration(); }