From d4eb5e58c547013d94eca425c3b74b3dcefea446 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Wed, 9 Apr 2014 17:30:38 +0400
Subject: [PATCH] Minor. Methods made static

---
 .../org/jetbrains/jet/lang/resolve/AnnotationResolver.java    | 4 ++--
 .../src/org/jetbrains/jet/lang/resolve/BodyResolver.java      | 4 ++--
 .../resolve/lazy/descriptors/AbstractLazyMemberScope.java     | 3 ++-
 .../jet/lang/types/expressions/ExpressionTypingServices.java  | 2 +-
 .../org/jetbrains/jet/plugin/project/ResolveElementCache.java | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

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 281b4c0ed2f..1a84f3a4671 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java
@@ -199,7 +199,7 @@ public class AnnotationResolver {
         );
     }
 
-    public void resolveAnnotationsArguments(@Nullable JetModifierList modifierList, @NotNull BindingTrace trace) {
+    public static void resolveAnnotationsArguments(@Nullable JetModifierList modifierList, @NotNull BindingTrace trace) {
         if (modifierList == null) {
             return;
         }
@@ -209,7 +209,7 @@ public class AnnotationResolver {
         }
     }
 
-    public void resolveAnnotationsArguments(@NotNull Annotated descriptor, @NotNull BindingTrace trace) {
+    public static void resolveAnnotationsArguments(@NotNull Annotated descriptor, @NotNull BindingTrace trace) {
         for (AnnotationDescriptor annotationDescriptor : descriptor.getAnnotations()) {
             JetAnnotationEntry annotationEntry = trace.getBindingContext().get(ANNOTATION_DESCRIPTOR_TO_PSI_ELEMENT, annotationDescriptor);
             assert annotationEntry != null : "Cannot find annotation entry: " + annotationDescriptor;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
index b48cfee6b37..05b6a5e0ac1 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
@@ -383,7 +383,7 @@ public class BodyResolver {
             ClassDescriptorWithResolutionScopes classDescriptor = entry.getValue();
             ConstructorDescriptor unsubstitutedPrimaryConstructor = classDescriptor.getUnsubstitutedPrimaryConstructor();
 
-            annotationResolver.resolveAnnotationsArguments(klass.getPrimaryConstructorModifierList(), trace);
+            AnnotationResolver.resolveAnnotationsArguments(klass.getPrimaryConstructorModifierList(), trace);
 
             if (unsubstitutedPrimaryConstructor != null) {
                 WritableScope parameterScope = getPrimaryConstructorParametersScope(classDescriptor.getScopeForClassHeaderResolution(), unsubstitutedPrimaryConstructor);
@@ -644,7 +644,7 @@ public class BodyResolver {
     }
 
     private void resolveAnnotationArguments(@NotNull JetScope scope, @NotNull JetModifierListOwner owner) {
-        annotationResolver.resolveAnnotationsArguments(owner.getModifierList(), trace);
+        AnnotationResolver.resolveAnnotationsArguments(owner.getModifierList(), trace);
     }
 
     private static void computeDeferredType(JetType type) {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java
index 94692a0b1a0..7d3f12cb6df 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java
@@ -25,6 +25,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.*;
+import org.jetbrains.jet.lang.resolve.AnnotationResolver;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.resolve.ScriptNameUtil;
 import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo;
@@ -185,7 +186,7 @@ public abstract class AbstractLazyMemberScope<D extends DeclarationDescriptor, D
                            // thus doesn't have a surrounding data flow
                            DataFlowInfo.EMPTY);
             result.add(propertyDescriptor);
-            resolveSession.getAnnotationResolver().resolveAnnotationsArguments(propertyDescriptor, trace);
+            AnnotationResolver.resolveAnnotationsArguments(propertyDescriptor, trace);
         }
 
         getNonDeclaredProperties(name, result);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java
index fc22fe4a679..042f6505484 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java
@@ -378,7 +378,7 @@ public class ExpressionTypingServices {
             ValueParameterDescriptor valueParameterDescriptor = valueParameterDescriptors.get(i);
             JetParameter jetParameter = valueParameters.get(i);
 
-            annotationResolver.resolveAnnotationsArguments(jetParameter.getModifierList(), trace);
+            AnnotationResolver.resolveAnnotationsArguments(jetParameter.getModifierList(), trace);
 
             if (!needCompleteAnalysis) continue;
 
diff --git a/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java b/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java
index 4db887b5c69..5735ab52c36 100644
--- a/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java
+++ b/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java
@@ -211,7 +211,7 @@ public class ResolveElementCache {
         if (declaration != null) {
             Annotated descriptor = resolveSession.resolveToDescriptor(declaration);
 
-            resolveSession.getAnnotationResolver().resolveAnnotationsArguments(
+            AnnotationResolver.resolveAnnotationsArguments(
                     descriptor,
                     resolveSession.getTrace()
             );