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

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2011-05-04 02:10:34 +00:00
parent ac05898a57
commit c2fe1df925
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/CIndex.java
View file

@ -91,11 +91,13 @@ public class CIndex implements IIndex {
return null; return null;
} }
public IIndexBinding[] findBindings(Pattern pattern, boolean isFullyQualified, IndexFilter filter, IProgressMonitor monitor) throws CoreException { public IIndexBinding[] findBindings(Pattern pattern, boolean isFullyQualified, IndexFilter filter,
IProgressMonitor monitor) throws CoreException {
return findBindings(new Pattern[] { pattern }, isFullyQualified, filter, monitor); return findBindings(new Pattern[] { pattern }, isFullyQualified, filter, monitor);
} }
public IIndexBinding[] findBindings(Pattern[] patterns, boolean isFullyQualified, IndexFilter filter, IProgressMonitor monitor) throws CoreException { public IIndexBinding[] findBindings(Pattern[] patterns, boolean isFullyQualified, IndexFilter filter,
IProgressMonitor monitor) throws CoreException {
if (SPECIALCASE_SINGLES && fFragments.length == 1) { if (SPECIALCASE_SINGLES && fFragments.length == 1) {
return fFragments[0].findBindings(patterns, isFullyQualified, filter, monitor); return fFragments[0].findBindings(patterns, isFullyQualified, filter, monitor);
} else { } else {
@ -122,7 +124,8 @@ public class CIndex implements IIndex {
} }
} }
public IIndexBinding[] findMacroContainers(Pattern pattern, IndexFilter filter, IProgressMonitor monitor) throws CoreException { public IIndexBinding[] findMacroContainers(Pattern pattern, IndexFilter filter, IProgressMonitor monitor)
throws CoreException {
if (SPECIALCASE_SINGLES && fFragments.length == 1) { if (SPECIALCASE_SINGLES && fFragments.length == 1) {
return fFragments[0].findMacroContainers(pattern, filter, monitor); return fFragments[0].findMacroContainers(pattern, filter, monitor);
} else { } else {
@ -133,7 +136,8 @@ public class CIndex implements IIndex {
IIndexFragmentBinding[][] fragmentBindings = new IIndexFragmentBinding[fPrimaryFragmentCount][]; IIndexFragmentBinding[][] fragmentBindings = new IIndexFragmentBinding[fPrimaryFragmentCount][];
for (int i = 0; i < fPrimaryFragmentCount; i++) { for (int i = 0; i < fPrimaryFragmentCount; i++) {
try { try {
IBinding[] part = fFragments[i].findMacroContainers(pattern, retargetFilter(linkage, filter), monitor); IBinding[] part = fFragments[i].findMacroContainers(pattern,
retargetFilter(linkage, filter), monitor);
fragmentBindings[i] = new IIndexFragmentBinding[part.length]; fragmentBindings[i] = new IIndexFragmentBinding[part.length];
System.arraycopy(part, 0, fragmentBindings[i], 0, part.length); System.arraycopy(part, 0, fragmentBindings[i], 0, part.length);
} catch (CoreException e) { } catch (CoreException e) {
@ -259,7 +263,8 @@ public class CIndex implements IIndex {
return result.toArray(new IIndexInclude[result.size()]); return result.toArray(new IIndexInclude[result.size()]);
} }
public void findIncludedBy(List<IIndexFile> in, List<IIndexInclude> out, int depth, HashSet<IIndexFileLocation> handled) throws CoreException { public void findIncludedBy(List<IIndexFile> in, List<IIndexInclude> out, int depth,
HashSet<IIndexFileLocation> handled) throws CoreException {
List<IIndexFile> nextLevel= depth != 0 ? new LinkedList<IIndexFile>() : null; List<IIndexFile> nextLevel= depth != 0 ? new LinkedList<IIndexFile>() : null;
for (IIndexFile iIndexFile : in) { for (IIndexFile iIndexFile : in) {
IIndexFragmentFile file = (IIndexFragmentFile) iIndexFile; IIndexFragmentFile file = (IIndexFragmentFile) iIndexFile;
@ -295,7 +300,8 @@ public class CIndex implements IIndex {
return result.toArray(new IIndexInclude[result.size()]); return result.toArray(new IIndexInclude[result.size()]);
} }
private void findIncludes(List<IIndexFile> in, List<IIndexInclude> out, int depth, HashSet<Object> handled) throws CoreException { private void findIncludes(List<IIndexFile> in, List<IIndexInclude> out, int depth,
HashSet<Object> handled) throws CoreException {
List<IIndexFile> nextLevel= depth != 0 ? new LinkedList<IIndexFile>() : null; List<IIndexFile> nextLevel= depth != 0 ? new LinkedList<IIndexFile>() : null;
for (IIndexFile iIndexFile : in) { for (IIndexFile iIndexFile : in) {
IIndexFragmentFile file = (IIndexFragmentFile) iIndexFile; IIndexFragmentFile file = (IIndexFragmentFile) iIndexFile;

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java
View file

@ -113,8 +113,8 @@ public class IndexFactory {
safeAddFragment(readOnlyFrag, fPDOMManager.getPDOM(cproject)); safeAddFragment(readOnlyFrag, fPDOMManager.getPDOM(cproject));
} }
Collection<IIndexFragment> roPdoms= readOnlyFrag.values(); Collection<IIndexFragment> readOnlyFragments= readOnlyFrag.values();
return new WritableCIndex(pdom, roPdoms.toArray(new IIndexFragment[roPdoms.size()]) ); return new WritableCIndex(pdom, readOnlyFragments.toArray(new IIndexFragment[readOnlyFragments.size()]));
} }
private Collection<ICProject> getProjects(ICProject[] projects, boolean addDependencies, private Collection<ICProject> getProjects(ICProject[] projects, boolean addDependencies,