From c97b13bfa3f53c66476a2729b043eca66d651f8b Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Mon, 3 Oct 2011 21:02:13 +0200
Subject: [PATCH] pull up containsClassNamed() to PsiPackage interface
 (temporarily?)

---
 .../java-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java | 3 +--
 .../src/com/intellij/psi/impl/file/PsiPackageImpl.java         | 1 +
 java/java-psi-api/src/com/intellij/psi/PsiPackage.java         | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java b/java/java-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java
index b30c02bd17a9..440588a16c10 100644
--- a/java/java-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java
@@ -25,7 +25,6 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileFilter;
 import com.intellij.psi.*;
-import com.intellij.psi.impl.file.PsiPackageImpl;
 import com.intellij.psi.impl.file.impl.JavaFileManager;
 import com.intellij.psi.impl.source.DummyHolderFactory;
 import com.intellij.psi.impl.source.JavaDummyHolder;
@@ -130,7 +129,7 @@ public class JavaPsiFacadeImpl extends JavaPsiFacadeEx {
       return Collections.emptyList();
     }
 
-    if (pkg == null || pkg instanceof PsiPackageImpl && !((PsiPackageImpl)pkg).containsClassNamed(className)) {
+    if (pkg == null || !pkg.containsClassNamed(className)) {
       return Collections.emptyList();
     }
 
diff --git a/java/java-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java b/java/java-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java
index dbcc311de0c7..03b112912633 100644
--- a/java/java-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java
@@ -250,6 +250,7 @@ public class PsiPackageImpl extends PsiPackageBase implements PsiPackage, Querya
     return getFacade().findClasses(classQName, scope);
   }
 
+  @Override
   public boolean containsClassNamed(String name) {
     return getClassNamesCache().contains(name);
   }
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiPackage.java b/java/java-psi-api/src/com/intellij/psi/PsiPackage.java
index 163ea4494073..3c06eaf46070 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiPackage.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiPackage.java
@@ -105,4 +105,6 @@ public interface PsiPackage extends PsiCheckedRenameElement, NavigationItem, Psi
   @Nullable("default package")
   @NonNls
   String getName();
+
+  boolean containsClassNamed(String name);
 }