mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-09 09:15:38 +02:00
Code Issues Wiki Activity

Additional fix for [Bug 197685] CfgScannerConfigInfo should getContainer with proper profileId

Browse source
This commit is contained in:
Mikhail Sennikovsky 2007-07-27 12:19:32 +00:00
parent 8d8572bbcb
commit f530f86969
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/IDiscoveredPathManager.java
View file

@ -114,6 +114,8 @@ public interface IDiscoveredPathManager {
IDiscoveredPathInfo getDiscoveredInfo(IProject project, InfoContext context) throws CoreException; IDiscoveredPathInfo getDiscoveredInfo(IProject project, InfoContext context) throws CoreException;
IDiscoveredPathInfo getDiscoveredInfo(IProject project, InfoContext context, boolean defaultToProjectSettings) throws CoreException;
IDiscoveredPathInfo getDiscoveredInfo(IProject project) throws CoreException; IDiscoveredPathInfo getDiscoveredInfo(IProject project) throws CoreException;
void removeDiscoveredInfo(IProject project); void removeDiscoveredInfo(IProject project);
void removeDiscoveredInfo(IProject project, InfoContext context); void removeDiscoveredInfo(IProject project, InfoContext context);

10
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DiscoveredPathManager.java
View file

@ -140,11 +140,15 @@ public class DiscoveredPathManager implements IDiscoveredPathManager, IResourceC
} }
public IDiscoveredPathInfo getDiscoveredInfo(IProject project, InfoContext context) throws CoreException{ public IDiscoveredPathInfo getDiscoveredInfo(IProject project, InfoContext context) throws CoreException{
return getDiscoveredInfo(project, context, true);
}
public IDiscoveredPathInfo getDiscoveredInfo(IProject project, InfoContext context, boolean defaultToProjectSettings) throws CoreException{
DiscoveredInfoHolder holder = getHolder(project, true); DiscoveredInfoHolder holder = getHolder(project, true);
IDiscoveredPathInfo info = holder.getInfo(context); IDiscoveredPathInfo info = holder.getInfo(context);
if(info == null){ if(info == null){
info = loadPathInfo(project, context); info = loadPathInfo(project, context, defaultToProjectSettings);
holder.setInfo(context, info); holder.setInfo(context, info);
} }
@ -160,12 +164,12 @@ public class DiscoveredPathManager implements IDiscoveredPathManager, IResourceC
return holder; return holder;
} }
private IDiscoveredPathInfo loadPathInfo(IProject project, InfoContext context) throws CoreException { private IDiscoveredPathInfo loadPathInfo(IProject project, InfoContext context, boolean defaultToProjectSettings) throws CoreException {
IDiscoveredPathInfo pathInfo = null; IDiscoveredPathInfo pathInfo = null;
IScannerConfigBuilderInfo2Set container = ScannerConfigProfileManager.createScannerConfigBuildInfo2Set(project); IScannerConfigBuilderInfo2Set container = ScannerConfigProfileManager.createScannerConfigBuildInfo2Set(project);
IScannerConfigBuilderInfo2 buildInfo = container.getInfo(context); IScannerConfigBuilderInfo2 buildInfo = container.getInfo(context);
if(buildInfo == null) if(buildInfo == null && defaultToProjectSettings)
buildInfo = container.getInfo(new InfoContext(project)); buildInfo = container.getInfo(new InfoContext(project));
if(buildInfo != null){ if(buildInfo != null){

2
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/CfgDiscoveredPathManager.java
View file

@ -285,7 +285,7 @@ public class CfgDiscoveredPathManager implements IResourceChangeListener {
} }
private IDiscoveredPathManager.IDiscoveredPathInfo loadPathInfo(IProject project, IConfiguration cfg, ContextInfo cInfo) throws CoreException{ private IDiscoveredPathManager.IDiscoveredPathInfo loadPathInfo(IProject project, IConfiguration cfg, ContextInfo cInfo) throws CoreException{
IDiscoveredPathManager.IDiscoveredPathInfo info = fBaseMngr.getDiscoveredInfo(cfg.getOwner().getProject(), cInfo.fLoadContext.toInfoContext()); IDiscoveredPathManager.IDiscoveredPathInfo info = fBaseMngr.getDiscoveredInfo(cfg.getOwner().getProject(), cInfo.fLoadContext.toInfoContext(), false);
if(!DiscoveredScannerInfoStore.getInstance().hasInfo(project, cInfo.fLoadContext.toInfoContext(), info.getSerializable())){ if(!DiscoveredScannerInfoStore.getInstance().hasInfo(project, cInfo.fLoadContext.toInfoContext(), info.getSerializable())){
// setCachedPathInfo(context, info); // setCachedPathInfo(context, info);
ICfgScannerConfigBuilderInfo2Set container = cInfo.fCfgInfo; ICfgScannerConfigBuilderInfo2Set container = cInfo.fCfgInfo;