MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Minor changes: introduce field 'PsiManager manager'.

Browse Source
This commit is contained in:
Sergey Evdokimov
2011-07-13 20:54:31 +04:00
parent e57583e705
commit f28fb2da79
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/NonClasspathClassFinder.java
+6 -4
View File
@@ -41,14 +41,16 @@ public abstract class NonClasspathClassFinder extends PsiElementFinder {
private final AtomicLong myLastStamp = new AtomicLong();
protected final Project myProject;
private volatile List<VirtualFile> myCache;
private final PsiManager myManager;
public NonClasspathClassFinder(Project project) {
myProject = project;
myManager = PsiManager.getInstance(myProject);
}
protected List<VirtualFile> getClassRoots() {
List<VirtualFile> cache = myCache;
long stamp = PsiManager.getInstance(myProject).getModificationTracker().getModificationCount();
long stamp = myManager.getModificationTracker().getModificationCount();
if (myLastStamp.get() != stamp) {
cache = null;
}
@@ -84,7 +86,7 @@ public abstract class NonClasspathClassFinder extends PsiElementFinder {
LOG.error("Invalid child of valid parent: " + classFile.getPath() + "; " + classRoot.isValid() + " path=" + classRoot.getPath());
return null;
}
final PsiFile file = PsiManager.getInstance(myProject).findFile(classFile);
final PsiFile file = myManager.findFile(classFile);
if (file instanceof PsiClassOwner) {
final PsiClass[] classes = ((PsiClassOwner)file).getClasses();
if (classes.length == 1) {
@@ -115,7 +117,7 @@ public abstract class NonClasspathClassFinder extends PsiElementFinder {
if (dir != null && dir.isDirectory()) {
for (final VirtualFile file : dir.getChildren()) {
if (!file.isDirectory()) {
final PsiFile psi = PsiManager.getInstance(myProject).findFile(file);
final PsiFile psi = myManager.findFile(file);
if (psi instanceof PsiClassOwner) {
ContainerUtil.addAll(result, ((PsiClassOwner)psi).getClasses());
}
@@ -169,7 +171,7 @@ public abstract class NonClasspathClassFinder extends PsiElementFinder {
}
private PsiPackageImpl createPackage(String qualifiedName) {
return new PsiPackageImpl((PsiManagerEx)PsiManager.getInstance(myProject), qualifiedName);
return new PsiPackageImpl((PsiManagerEx)myManager, qualifiedName);
}
@Override