Extract JavaResolverPsiUtils

Will contain PSI-specific JDR utilities

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/DescriptorResolverUtils.java

@@ -17,7 +17,6 @@
 package org.jetbrains.jet.lang.resolve.java;
 
 import com.google.common.collect.ImmutableSet;
-import com.intellij.psi.PsiClass;
 import com.intellij.psi.impl.compiled.ClsClassImpl;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -38,30 +37,25 @@ public final class DescriptorResolverUtils {
     private DescriptorResolverUtils() {
     }
 
-    public static boolean isCompiledKotlinPackageClass(@NotNull PsiClass psiClass) {
-        if (psiClass instanceof ClsClassImpl) {
-            JavaClass javaClass = new JavaClass(psiClass);
+    public static boolean isCompiledKotlinPackageClass(@NotNull JavaClass javaClass) {
+        if (javaClass.getPsi() instanceof ClsClassImpl) {
             FqName fqName = javaClass.getFqName();
             if (fqName != null && PackageClassUtils.isPackageClassFqName(fqName)) {
-                return hasAnnotation(javaClass, JvmAnnotationNames.KOTLIN_PACKAGE.getFqName());
+                return javaClass.findAnnotation(JvmAnnotationNames.KOTLIN_PACKAGE.getFqName().asString()) != null;
             }
         }
         return false;
     }
 
-    public static boolean isCompiledKotlinClass(@NotNull PsiClass psiClass) {
-        if (psiClass instanceof ClsClassImpl) {
-            return hasAnnotation(new JavaClass(psiClass), JvmAnnotationNames.KOTLIN_CLASS.getFqName());
+    public static boolean isCompiledKotlinClass(@NotNull JavaClass javaClass) {
+        if (javaClass.getPsi() instanceof ClsClassImpl) {
+            return javaClass.findAnnotation(JvmAnnotationNames.KOTLIN_CLASS.getFqName().asString()) != null;
         }
         return false;
     }
 
-    public static boolean hasAnnotation(@NotNull JavaClass javaClass, @NotNull FqName annotationFqName) {
-        return javaClass.findAnnotation(annotationFqName.asString()) != null;
-    }
-
-    public static boolean isCompiledKotlinClassOrPackageClass(@NotNull PsiClass psiClass) {
-        return isCompiledKotlinClass(psiClass) || isCompiledKotlinPackageClass(psiClass);
+    public static boolean isCompiledKotlinClassOrPackageClass(@NotNull JavaClass javaClass) {
+        return isCompiledKotlinClass(javaClass) || isCompiledKotlinPackageClass(javaClass);
     }
 
     @NotNull

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverPsiUtils.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2010-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.lang.resolve.java;
+
+import com.intellij.psi.PsiClass;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.resolve.java.structure.JavaClass;
+
+public class JavaResolverPsiUtils {
+    private JavaResolverPsiUtils() {
+    }
+
+    public static boolean isCompiledKotlinClass(@NotNull PsiClass psiClass) {
+        return DescriptorResolverUtils.isCompiledKotlinClass(new JavaClass(psiClass));
+    }
+
+    public static boolean isCompiledKotlinPackageClass(@NotNull PsiClass psiClass) {
+        return DescriptorResolverUtils.isCompiledKotlinPackageClass(new JavaClass(psiClass));
+    }
+
+    public static boolean isCompiledKotlinClassOrPackageClass(@NotNull PsiClass psiClass) {
+        return isCompiledKotlinClass(psiClass) || isCompiledKotlinPackageClass(psiClass);
+    }
+}

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java

@@ -178,7 +178,7 @@ public final class JavaNamespaceResolver {
             return null;
         }
 
-        if (DescriptorResolverUtils.isCompiledKotlinClassOrPackageClass(javaClass.getPsi())) {
+        if (DescriptorResolverUtils.isCompiledKotlinClassOrPackageClass(javaClass)) {
             return null;
         }
         if (!hasStaticMembers(javaClass)) {
@@ -253,7 +253,7 @@ public final class JavaNamespaceResolver {
         Collection<JavaClass> classes = DescriptorResolverUtils.filterDuplicateClasses(javaPackage.getClasses());
         List<Name> result = new ArrayList<Name>(classes.size());
         for (JavaClass javaClass : classes) {
-            if (DescriptorResolverUtils.isCompiledKotlinClass(javaClass.getPsi())) {
+            if (DescriptorResolverUtils.isCompiledKotlinClass(javaClass)) {
                 result.add(javaClass.getName());
             }
         }

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java

@@ -95,7 +95,7 @@ public final class JavaPackageScope extends JavaBaseScope {
         }
 
         for (JavaClass javaClass : DescriptorResolverUtils.filterDuplicateClasses(javaPackage.getClasses())) {
-            if (DescriptorResolverUtils.isCompiledKotlinPackageClass(javaClass.getPsi())) continue;
+            if (DescriptorResolverUtils.isCompiledKotlinPackageClass(javaClass)) continue;
 
             if (javaClass.getPsi() instanceof JetJavaMirrorMarker) continue;