azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using JetValueParameterAnnotation factory method instead of constructor.

Browse Source 
Made constructor private.
This commit is contained in:
Evgeny Gerashchenko
2012-09-27 17:53:09 +04:00
parent 0012dd49da
commit 0d7544c6a9
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetValueParameterAnnotation.java
+1 -1
View File
@@ -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);
}
idea/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java
+6 -14
View File
@@ -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);
}
}
}