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=65739

Browse source
This commit is contained in:
David Inglis 2004-06-07 18:55:24 +00:00
parent cbd4446ff5
commit af881d96fc
1 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -103,6 +103,7 @@ 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));
@ -129,6 +130,7 @@ public class DiscoveryOptionsBlock extends AbstractCOptionPage {
fBuildInfo = MakeCorePlugin.createScannerConfigBuildInfo(fPrefs, ScannerConfigBuilder.BUILDER_ID, true); fBuildInfo = MakeCorePlugin.createScannerConfigBuildInfo(fPrefs, ScannerConfigBuilder.BUILDER_ID, true);
} }
} else { } else {
fCreatePathContainer = true;
fBuildInfo = MakeCorePlugin.createScannerConfigBuildInfo(fPrefs, ScannerConfigBuilder.BUILDER_ID, false); fBuildInfo = MakeCorePlugin.createScannerConfigBuildInfo(fPrefs, ScannerConfigBuilder.BUILDER_ID, false);
} }
retrieveSIConsoleParsers(); retrieveSIConsoleParsers();
@ -159,13 +161,11 @@ public class DiscoveryOptionsBlock extends AbstractCOptionPage {
needsSCNature = false; needsSCNature = false;
} }
buildInfo = MakeCorePlugin.createScannerConfigBuildInfo(project, ScannerConfigBuilder.BUILDER_ID); buildInfo = MakeCorePlugin.createScannerConfigBuildInfo(project, ScannerConfigBuilder.BUILDER_ID);
if (isScannerConfigDiscoveryEnabled()) { if (fCreatePathContainer) {
createDiscoveredPathContainer(project, monitor); createDiscoveredPathContainer(project, monitor);
} else {
removeDiscoveredPathContainer(project, monitor);
}
// create a new discovered scanner config store // create a new discovered scanner config store
MakeCorePlugin.getDefault().getDiscoveryManager().removeDiscoveredInfo(project); MakeCorePlugin.getDefault().getDiscoveryManager().removeDiscoveredInfo(project);
}
} else { } else {
buildInfo = MakeCorePlugin.createScannerConfigBuildInfo(fPrefs, ScannerConfigBuilder.BUILDER_ID, false); buildInfo = MakeCorePlugin.createScannerConfigBuildInfo(fPrefs, ScannerConfigBuilder.BUILDER_ID, false);
} }
@ -211,19 +211,6 @@ public class DiscoveryOptionsBlock extends AbstractCOptionPage {
} }
} }
private void removeDiscoveredPathContainer(IProject project, IProgressMonitor monitor) 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()]), monitor);
}
}
}
/* /*
* (non-Javadoc) * (non-Javadoc)
* *