diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java index 8c4e960c320..78ca3c79385 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.resolve.java.PsiClassFinderImpl; import org.jetbrains.jet.lang.resolve.java.vfilefinder.VirtualFileFinder; import org.jetbrains.jet.lang.resolve.java.resolver.JavaClassResolver; import org.jetbrains.jet.lang.resolve.java.resolver.JavaAnnotationResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.JavaCompileTimeConstResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaAnnotationArgumentResolver; import org.jetbrains.jet.lang.resolve.java.resolver.JavaFunctionResolver; import org.jetbrains.jet.lang.resolve.java.resolver.JavaValueParameterResolver; import org.jetbrains.jet.lang.resolve.java.resolver.JavaTypeTransformer; @@ -49,7 +49,7 @@ public class InjectorForJavaDescriptorResolver { private final VirtualFileFinder virtualFileFinder; private final JavaClassResolver javaClassResolver; private final JavaAnnotationResolver javaAnnotationResolver; - private final JavaCompileTimeConstResolver javaCompileTimeConstResolver; + private final JavaAnnotationArgumentResolver javaAnnotationArgumentResolver; private final JavaFunctionResolver javaFunctionResolver; private final JavaValueParameterResolver javaValueParameterResolver; private final JavaTypeTransformer javaTypeTransformer; @@ -73,7 +73,7 @@ public class InjectorForJavaDescriptorResolver { this.virtualFileFinder = com.intellij.openapi.components.ServiceManager.getService(project, VirtualFileFinder.class); this.javaClassResolver = new JavaClassResolver(); this.javaAnnotationResolver = new JavaAnnotationResolver(); - this.javaCompileTimeConstResolver = new JavaCompileTimeConstResolver(); + this.javaAnnotationArgumentResolver = new JavaAnnotationArgumentResolver(); this.javaFunctionResolver = new JavaFunctionResolver(); this.javaValueParameterResolver = new JavaValueParameterResolver(); this.javaTypeTransformer = new JavaTypeTransformer(); @@ -106,11 +106,11 @@ public class InjectorForJavaDescriptorResolver { javaClassResolver.setTrace(bindingTrace); javaClassResolver.setVirtualFileFinder(virtualFileFinder); + javaAnnotationResolver.setArgumentResolver(javaAnnotationArgumentResolver); javaAnnotationResolver.setClassResolver(javaClassResolver); - javaAnnotationResolver.setCompileTimeConstResolver(javaCompileTimeConstResolver); - javaCompileTimeConstResolver.setAnnotationResolver(javaAnnotationResolver); - javaCompileTimeConstResolver.setClassResolver(javaClassResolver); + javaAnnotationArgumentResolver.setAnnotationResolver(javaAnnotationResolver); + javaAnnotationArgumentResolver.setClassResolver(javaClassResolver); javaFunctionResolver.setAnnotationResolver(javaAnnotationResolver); javaFunctionResolver.setParameterResolver(javaValueParameterResolver); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java index 5b9c87e79d2..0828dd00ef3 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java @@ -51,7 +51,7 @@ import org.jetbrains.jet.lang.resolve.TypeHierarchyResolver; import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; import org.jetbrains.jet.lang.resolve.java.resolver.JavaClassResolver; import org.jetbrains.jet.lang.resolve.java.resolver.JavaAnnotationResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.JavaCompileTimeConstResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaAnnotationArgumentResolver; import org.jetbrains.jet.lang.resolve.java.resolver.JavaFunctionResolver; import org.jetbrains.jet.lang.resolve.java.resolver.JavaValueParameterResolver; import org.jetbrains.jet.lang.resolve.java.resolver.JavaTypeTransformer; @@ -103,7 +103,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly private final ScriptBodyResolver scriptBodyResolver; private final JavaClassResolver javaClassResolver; private final JavaAnnotationResolver javaAnnotationResolver; - private final JavaCompileTimeConstResolver javaCompileTimeConstResolver; + private final JavaAnnotationArgumentResolver javaAnnotationArgumentResolver; private final JavaFunctionResolver javaFunctionResolver; private final JavaValueParameterResolver javaValueParameterResolver; private final JavaTypeTransformer javaTypeTransformer; @@ -156,7 +156,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly this.scriptBodyResolver = new ScriptBodyResolver(); this.javaClassResolver = new JavaClassResolver(); this.javaAnnotationResolver = new JavaAnnotationResolver(); - this.javaCompileTimeConstResolver = new JavaCompileTimeConstResolver(); + this.javaAnnotationArgumentResolver = new JavaAnnotationArgumentResolver(); this.javaFunctionResolver = new JavaFunctionResolver(); this.javaValueParameterResolver = new JavaValueParameterResolver(); this.javaTypeTransformer = new JavaTypeTransformer(); @@ -293,11 +293,11 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly javaClassResolver.setTrace(bindingTrace); javaClassResolver.setVirtualFileFinder(virtualFileFinder); + javaAnnotationResolver.setArgumentResolver(javaAnnotationArgumentResolver); javaAnnotationResolver.setClassResolver(javaClassResolver); - javaAnnotationResolver.setCompileTimeConstResolver(javaCompileTimeConstResolver); - javaCompileTimeConstResolver.setAnnotationResolver(javaAnnotationResolver); - javaCompileTimeConstResolver.setClassResolver(javaClassResolver); + javaAnnotationArgumentResolver.setAnnotationResolver(javaAnnotationResolver); + javaAnnotationArgumentResolver.setClassResolver(javaClassResolver); javaFunctionResolver.setAnnotationResolver(javaAnnotationResolver); javaFunctionResolver.setParameterResolver(javaValueParameterResolver); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/AnnotationDescriptorDeserializer.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/AnnotationDescriptorDeserializer.java index f762189b9c7..e7eed411bdb 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/AnnotationDescriptorDeserializer.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/AnnotationDescriptorDeserializer.java @@ -191,7 +191,7 @@ public class AnnotationDescriptorDeserializer implements AnnotationDeserializer // TODO: arrays, annotations @Override public void visit(String name, Object value) { - CompileTimeConstant argument = JavaCompileTimeConstResolver.resolveCompileTimeConstantValue(value, null); + CompileTimeConstant argument = JavaAnnotationArgumentResolver.resolveCompileTimeConstantValue(value, null); if (argument != null) { setArgumentValueByName(name, argument); } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaCompileTimeConstResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationArgumentResolver.java similarity index 98% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaCompileTimeConstResolver.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationArgumentResolver.java index 401d4e9d652..54670d2c5f1 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaCompileTimeConstResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationArgumentResolver.java @@ -40,13 +40,10 @@ import java.util.List; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getEnumEntriesScope; import static org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule.INCLUDE_KOTLIN_SOURCES; -public final class JavaCompileTimeConstResolver { +public final class JavaAnnotationArgumentResolver { private JavaAnnotationResolver annotationResolver; private JavaClassResolver classResolver; - public JavaCompileTimeConstResolver() { - } - @Inject public void setAnnotationResolver(JavaAnnotationResolver annotationResolver) { this.annotationResolver = annotationResolver; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationResolver.java index 3ecb5e9f974..4e5c0d30034 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationResolver.java @@ -47,7 +47,7 @@ public final class JavaAnnotationResolver { public static final Name DEFAULT_ANNOTATION_MEMBER_NAME = Name.identifier("value"); private JavaClassResolver classResolver; - private JavaCompileTimeConstResolver compileTimeConstResolver; + private JavaAnnotationArgumentResolver argumentResolver; public JavaAnnotationResolver() { } @@ -58,8 +58,8 @@ public final class JavaAnnotationResolver { } @Inject - public void setCompileTimeConstResolver(JavaCompileTimeConstResolver compileTimeConstResolver) { - this.compileTimeConstResolver = compileTimeConstResolver; + public void setArgumentResolver(JavaAnnotationArgumentResolver argumentResolver) { + this.argumentResolver = argumentResolver; } @NotNull @@ -119,7 +119,7 @@ public final class JavaAnnotationResolver { for (JavaAnnotationArgument argument : javaAnnotation.getArguments()) { - CompileTimeConstant value = compileTimeConstResolver.resolveAnnotationArgument(fqName, argument, postponedTasks); + CompileTimeConstant value = argumentResolver.resolveAnnotationArgument(fqName, argument, postponedTasks); if (value == null) continue; Name name = argument.getName(); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java index a4b953ef2ef..0692a058328 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java @@ -158,7 +158,7 @@ public final class JavaPropertyResolver { if (AnnotationUtils.isPropertyAcceptableAsAnnotationParameter(propertyDescriptor)) { PsiExpression initializer = field.getPsi().getInitializer(); if (initializer instanceof PsiLiteralExpression) { - CompileTimeConstant constant = JavaCompileTimeConstResolver + CompileTimeConstant constant = JavaAnnotationArgumentResolver .resolveCompileTimeConstantValue(((PsiLiteralExpression) initializer).getValue(), propertyType); if (constant != null) { trace.record(BindingContext.COMPILE_TIME_INITIALIZER, propertyDescriptor, constant);