mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-19 06:55:23 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2011-05-24 03:36:07 +00:00
parent d42416a53b
commit 9a867fd85e
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java
View file

@ -443,13 +443,13 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange
public PathEntryResolveInfo getResolveInfo(ICProject cproject, boolean useCache) throws CModelException{ public PathEntryResolveInfo getResolveInfo(ICProject cproject, boolean useCache) throws CModelException{
PathEntryResolveInfo info = resolvedInfoMap.get(cproject); PathEntryResolveInfo info = resolvedInfoMap.get(cproject);
if(info == null && useCache){ if (info == null && useCache){
getResolvedPathEntries(cproject); getResolvedPathEntries(cproject);
info = resolvedInfoMap.get(cproject); info = resolvedInfoMap.get(cproject);
} }
if(info == null || !useCache || !getResolveInfoValidState(cproject)){ if (info == null || !useCache || !getResolveInfoValidState(cproject)){
Object[] resolved = getResolvedPathEntries(cproject, false, false); Object[] resolved = getResolvedPathEntries(cproject, false, false);
if(resolved != null) if (resolved != null)
info = (PathEntryResolveInfo)resolved[1]; info = (PathEntryResolveInfo)resolved[1];
} }
return info; return info;
@ -532,7 +532,7 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private ArrayList<IPathEntry> getResolvedPathEntries(ICProject cproject, boolean generateMarkers) throws CModelException { private ArrayList<IPathEntry> getResolvedPathEntries(ICProject cproject, boolean generateMarkers) throws CModelException {
Object[] result = getResolvedPathEntries(cproject, generateMarkers, true); Object[] result = getResolvedPathEntries(cproject, generateMarkers, true);
if(result != null) if (result != null)
return (ArrayList<IPathEntry>)result[0]; return (ArrayList<IPathEntry>)result[0];
return null; return null;
} }
@ -540,7 +540,7 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange
private Object[] getResolvedPathEntries(ICProject cproject, boolean generateMarkers, boolean useCache) throws CModelException { private Object[] getResolvedPathEntries(ICProject cproject, boolean generateMarkers, boolean useCache) throws CModelException {
ArrayList<IPathEntry> resolvedEntries = null; ArrayList<IPathEntry> resolvedEntries = null;
PathEntryResolveInfo rInfo = null; PathEntryResolveInfo rInfo = null;
if(useCache){ if (useCache){
resolvedEntries = resolvedMap.get(cproject); resolvedEntries = resolvedMap.get(cproject);
rInfo = resolvedInfoMap.get(cproject); rInfo = resolvedInfoMap.get(cproject);
} }
@ -619,7 +619,7 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange
} }
rInfo = new PathEntryResolveInfo(resolveInfoList); rInfo = new PathEntryResolveInfo(resolveInfoList);
if(useCache){ if (useCache){
resolvedMap.put(cproject, resolvedEntries); resolvedMap.put(cproject, resolvedEntries);
resolvedInfoMap.put(cproject, rInfo); resolvedInfoMap.put(cproject, rInfo);
} }
@ -1053,7 +1053,7 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange
} }
public ICElementDelta[] generatePathEntryDeltas(ICProject cproject, IPathEntry[] oldEntries, IPathEntry[] newEntries) { public ICElementDelta[] generatePathEntryDeltas(ICProject cproject, IPathEntry[] oldEntries, IPathEntry[] newEntries) {
if(!needDelta(cproject)) if (!needDelta(cproject))
return new ICElementDelta[0]; return new ICElementDelta[0];
ArrayList<ICElementDelta> list = new ArrayList<ICElementDelta>(); ArrayList<ICElementDelta> list = new ArrayList<ICElementDelta>();
@ -1243,7 +1243,7 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange
synchronized (storeMap){ synchronized (storeMap){
IPathEntryStore store = storeMap.get(project); IPathEntryStore store = storeMap.get(project);
if (store == null) { if (store == null) {
if(create == true){ if (create == true){
store = createPathEntryStore(project); store = createPathEntryStore(project);
storeMap.put(project, store); storeMap.put(project, store);
store.addPathEntryStoreListener(this); store.addPathEntryStoreListener(this);
@ -1286,7 +1286,7 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange
} }
// private IPathEntryStore createDefaultStore(IProject project){ // private IPathEntryStore createDefaultStore(IProject project){
// if(CProjectDescriptionManager.getInstance().isNewStyleIndexCfg(project)){ // if (CProjectDescriptionManager.getInstance().isNewStyleIndexCfg(project)){
// return new ConfigBasedPathEntryStore(project); // return new ConfigBasedPathEntryStore(project);
// } // }
// return new DefaultPathEntryStore(project); // return new DefaultPathEntryStore(project);