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

fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=65565

Browse source
This commit is contained in:
David Inglis 2004-06-03 18:08:49 +00:00
parent a3995849f5
commit a9691ef057
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/DiscoveryOptionsBlock.java
View file

@ -105,7 +105,6 @@ public class DiscoveryOptionsBlock extends AbstractCOptionPage {
private String initialBuilderParserId = null; private String initialBuilderParserId = null;
private Map providerParsers = new HashMap(); private Map providerParsers = new HashMap();
private String initialProviderParserId = null; private String initialProviderParserId = null;
private boolean fCreatePathContainer = false;
public DiscoveryOptionsBlock() { public DiscoveryOptionsBlock() {
super(MakeUIPlugin.getResourceString(DIALOG_TITLE)); super(MakeUIPlugin.getResourceString(DIALOG_TITLE));
@ -131,7 +130,6 @@ public class DiscoveryOptionsBlock extends AbstractCOptionPage {
fInitialized = false; fInitialized = false;
fBuildInfo = MakeCorePlugin.createScannerConfigBuildInfo(fPrefs, ScannerConfigBuilder.BUILDER_ID, true); fBuildInfo = MakeCorePlugin.createScannerConfigBuildInfo(fPrefs, ScannerConfigBuilder.BUILDER_ID, true);
} }
fCreatePathContainer = true;
} else { } else {
fBuildInfo = MakeCorePlugin.createScannerConfigBuildInfo(fPrefs, ScannerConfigBuilder.BUILDER_ID, false); fBuildInfo = MakeCorePlugin.createScannerConfigBuildInfo(fPrefs, ScannerConfigBuilder.BUILDER_ID, false);
} }
@ -159,11 +157,13 @@ public class DiscoveryOptionsBlock extends AbstractCOptionPage {
IProject project = getContainer().getProject(); IProject project = getContainer().getProject();
if (project != null) { if (project != null) {
buildInfo = MakeCorePlugin.createScannerConfigBuildInfo(project, ScannerConfigBuilder.BUILDER_ID); buildInfo = MakeCorePlugin.createScannerConfigBuildInfo(project, ScannerConfigBuilder.BUILDER_ID);
if (fCreatePathContainer) { if (isScannerConfigDiscoveryEnabled()) {
createDiscoveredPathContainer(project); createDiscoveredPathContainer(project);
// create a new discovered scanner config store } else {
MakeCorePlugin.getDefault().getDiscoveryManager().removeDiscoveredInfo(project); removeDiscoveredPathContainer(project);
} }
// create a new discovered scanner config store
MakeCorePlugin.getDefault().getDiscoveryManager().removeDiscoveredInfo(project);
} else { } else {
buildInfo = MakeCorePlugin.createScannerConfigBuildInfo(fPrefs, ScannerConfigBuilder.BUILDER_ID, false); buildInfo = MakeCorePlugin.createScannerConfigBuildInfo(fPrefs, ScannerConfigBuilder.BUILDER_ID, false);
} }
@ -209,6 +209,20 @@ public class DiscoveryOptionsBlock extends AbstractCOptionPage {
} }
} }
private void removeDiscoveredPathContainer(IProject project) throws CModelException {
IPathEntry container = CoreModel.newContainerEntry(DiscoveredPathContainer.CONTAINER_ID);
ICProject cProject = CoreModel.getDefault().create(project);
if (cProject != null) {
IPathEntry[] entries = cProject.getRawPathEntries();
List newEntries = new ArrayList(Arrays.asList(entries));
if (newEntries.contains(container)) {
newEntries.remove(container);
cProject.setRawPathEntries((IPathEntry[])newEntries.toArray(new IPathEntry[newEntries.size()]),
new NullProgressMonitor());
}
}
}
/* /*
* (non-Javadoc) * (non-Javadoc)
* *