From 368381a861d225127f68021aa07aaf599ef4b313 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 21 Mar 2014 15:11:07 +0400 Subject: [PATCH] Minor. Rename method --- .../jet/lang/evaluate/ConstantExpressionEvaluator.kt | 2 +- .../org/jetbrains/jet/lang/resolve/AnnotationResolver.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt b/compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt index a81404a132a..641ae0175a9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt @@ -350,7 +350,7 @@ public class ConstantExpressionEvaluator private (val trace: BindingTrace) : Jet if (DescriptorUtils.isAnnotationClass(classDescriptor)) { val descriptor = AnnotationDescriptorImpl() descriptor.setAnnotationType(classDescriptor.getDefaultType()) - AnnotationResolver.resolveAnnotationArgument(descriptor, call, trace) + AnnotationResolver.resolveAnnotationArguments(descriptor, call, trace) return AnnotationValue(descriptor) } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java index cbc19a5f659..5d1f2a967c2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java @@ -215,11 +215,11 @@ public class AnnotationResolver { if (results.isSingleResult()) { AnnotationDescriptorImpl annotationDescriptor = trace.getBindingContext().get(BindingContext.ANNOTATION, annotationEntry); assert annotationDescriptor != null : "Annotation descriptor should be created before resolving arguments for " + annotationEntry.getText(); - resolveAnnotationArgument(annotationDescriptor, results.getResultingCall(), trace); + resolveAnnotationArguments(annotationDescriptor, results.getResultingCall(), trace); } } - public static void resolveAnnotationArgument( + public static void resolveAnnotationArguments( @NotNull AnnotationDescriptorImpl annotationDescriptor, @NotNull ResolvedCall resolvedCall, @NotNull BindingTrace trace