mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-24 17:35:35 +02:00
Code Issues Wiki Activity

Bug 354194 - My previous fix accidentally prevented the creation of the config info map entry for the project root folder, thus scanner discovery preferences were no longer being persisted. This adjustment adds an exeption for that rcinfo.

Browse source
This commit is contained in:
John Cortell 2011-09-19 14:18:35 -05:00
parent c686b86ceb
commit dabef579a2
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig2/CfgScannerConfigInfoFactory2.java
View file

@ -37,6 +37,7 @@ import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
import org.eclipse.cdt.managedbuilder.internal.core.Configuration;
import org.eclipse.cdt.managedbuilder.internal.dataprovider.BuildConfigurationData;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Preferences;
import org.eclipse.core.runtime.QualifiedName;
@ -193,7 +194,8 @@ public class CfgScannerConfigInfoFactory2 {
info = configMap.get(superContext);
}
// Files with custom properties don't have a persisted entry in the config
// Scanner discovery options aren't settable on a file-per-file basis. Thus
// files with custom properties don't have a persisted entry in the config
// info map; we create an ephemeral entry instead. We need to assign that file
// the scanner profile that's used for non-custom files of the same
// inputType/tool (and configuration, of course). Unfortunately, identifying
@ -231,8 +233,13 @@ public class CfgScannerConfigInfoFactory2 {
// permanent and stagnant part of the project description. It was
// added to the container only so we could obtain an
// IScannerConfigBuilderInfo2. Now that we have the info object,
// revert the container. See Bug 354194
container.removeInfo(context.toInfoContext());
// revert the container. See Bug 354194. Note that the permanent
// entry for the project's root folder resource info gets created
// by us shortly after project creation; thus we have to make an
// exception for that rcinfo.
if (!(rcInfo instanceof IFolderInfo && rcInfo.getPath().isEmpty())) {
container.removeInfo(context.toInfoContext());
}
}
if(info != null){
map.put(context, info);