JDR: Remove some usages of JavaClassResolver#resolveClassByFqName in LazyJavaAnnotationDescriptor

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt

@@ -64,7 +64,7 @@ class LazyJavaAnnotationDescriptor(
         val fqName = _fqName()
         if (fqName == null) return@createLazyValue ErrorUtils.createErrorType("No fqName: $javaAnnotation")
         val annotationClass = JavaToKotlinClassMap.getInstance().mapKotlinClass(fqName, TypeUsage.MEMBER_SIGNATURE_INVARIANT)
-                                ?: c.javaClassResolver.resolveClassByFqName(fqName)
+                ?: javaAnnotation.resolve()?.let { javaClass -> c.javaClassResolver.resolveClass(javaClass) }
         annotationClass?.getDefaultType() ?: ErrorUtils.createErrorType(fqName.asString())
     }
 
@@ -145,10 +145,9 @@ class LazyJavaAnnotationDescriptor(
 
         if (!element.isEnumEntry()) return null
 
-        val fqName = element.getContainingClass().getFqName()
-        if (fqName == null) return null
+        val containingJavaClass = element.getContainingClass()
 
-        val enumClass = c.javaClassResolver.resolveClassByFqName(fqName)
+        val enumClass = c.javaClassResolver.resolveClass(containingJavaClass)
         if (enumClass == null) return null
 
         val classifier = enumClass.getUnsubstitutedInnerClassesScope().getClassifier(element.getName())

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotation.java

@@ -32,4 +32,7 @@ public interface JavaAnnotation extends JavaElement {
 
     @Nullable
     FqName getFqName();
+
+    @Nullable
+    JavaClass resolve();
 }