From 0d7544c6a996cad1569cb59e768a85c612e7f23e Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Thu, 27 Sep 2012 17:53:09 +0400
Subject: [PATCH] Using JetValueParameterAnnotation factory method instead of
 constructor.

Made constructor private.
---
 .../java/kt/JetValueParameterAnnotation.java  |  2 +-
 .../caches/JetFromJavaDescriptorHelper.java   | 20 ++++++-------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetValueParameterAnnotation.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetValueParameterAnnotation.java
index 0578246ab36..27ba2d8c916 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetValueParameterAnnotation.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetValueParameterAnnotation.java
@@ -38,7 +38,7 @@ public class JetValueParameterAnnotation extends PsiAnnotationWrapper {
     private boolean receiver;
     private boolean hasDefaultValue;
 
-    public JetValueParameterAnnotation(@Nullable PsiAnnotation psiAnnotation) {
+    private JetValueParameterAnnotation(@Nullable PsiAnnotation psiAnnotation) {
         super(psiAnnotation);
     }
 
diff --git a/idea/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java b/idea/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java
index 7e03d6ad9bc..da429d65dcf 100644
--- a/idea/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java
+++ b/idea/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java
@@ -27,7 +27,6 @@ import com.intellij.psi.util.PsiTreeUtil;
 import jet.runtime.typeinfo.JetValueParameter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
 import org.jetbrains.jet.lang.resolve.java.kt.JetValueParameterAnnotation;
 import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -86,17 +85,16 @@ class JetFromJavaDescriptorHelper {
                 JetValueParameter.class.getSimpleName(), project, scope);
 
         for (PsiAnnotation parameterAnnotation : valueParametersAnnotations) {
-            String qualifiedName = parameterAnnotation.getQualifiedName();
-
-            if (qualifiedName == null || !qualifiedName.equals(JetValueParameter.class.getCanonicalName())) {
+            PsiParameter parameter = PsiTreeUtil.getParentOfType(parameterAnnotation, PsiParameter.class);
+            if (parameter == null) {
                 continue;
             }
 
-            if (!new JetValueParameterAnnotation(parameterAnnotation).receiver()) {
+            if (!JetValueParameterAnnotation.get(parameter).receiver()) {
                 continue;
             }
 
-            PsiMethod psiMethod = PsiTreeUtil.getParentOfType(parameterAnnotation, PsiMethod.class);
+            PsiMethod psiMethod = PsiTreeUtil.getParentOfType(parameter, PsiMethod.class);
             if (psiMethod != null) {
                 extensionNames.add(psiMethod.getName());
             }
@@ -167,14 +165,8 @@ class JetFromJavaDescriptorHelper {
 
             // Should be parameter with JetValueParameter.receiver == true
             for (PsiParameter parameter : psiMethod.getParameterList().getParameters()) {
-                for (PsiAnnotation psiAnnotation : JavaDescriptorResolver.getAllAnnotations(parameter)) {
-                    if (!JetValueParameter.class.getCanonicalName().equals(psiAnnotation.getQualifiedName())) {
-                        continue;
-                    }
-
-                    if (filterPredicate.apply(new JetValueParameterAnnotation(psiAnnotation))) {
-                        selectedMethods.add(psiMethod);
-                    }
+                if (filterPredicate.apply(JetValueParameterAnnotation.get(parameter))) {
+                    selectedMethods.add(psiMethod);
                 }
             }
         }