From f28fb2da79c1a73a8a04254e14fcb4b454f6d141 Mon Sep 17 00:00:00 2001
From: Sergey Evdokimov <sergey.evdokimov@jetbrains.com>
Date: Wed, 13 Jul 2011 20:53:56 +0400
Subject: [PATCH] Minor changes: introduce field 'PsiManager manager'.

---
 .../src/com/intellij/psi/NonClasspathClassFinder.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/java/java-impl/src/com/intellij/psi/NonClasspathClassFinder.java b/java/java-impl/src/com/intellij/psi/NonClasspathClassFinder.java
index dd60aefb5a3e..74c154d87d24 100644
--- a/java/java-impl/src/com/intellij/psi/NonClasspathClassFinder.java
+++ b/java/java-impl/src/com/intellij/psi/NonClasspathClassFinder.java
@@ -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