From 1fdb86f733e1540f2f4cc8e9d5bd2d9eb9b6a889 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Tue, 15 Oct 2013 20:21:00 +0400
Subject: [PATCH] JavaArrayAnnotationArgument.getElements() returns List

---
 .../java/structure/impl/JavaArrayAnnotationArgumentImpl.java  | 4 ++--
 .../structure/impl/JavaElementCollectionFromPsiArrayUtil.java | 4 ++--
 .../resolve/java/resolver/JavaAnnotationArgumentResolver.java | 3 +--
 .../resolve/java/structure/JavaArrayAnnotationArgument.java   | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaArrayAnnotationArgumentImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaArrayAnnotationArgumentImpl.java
index d0bc15da2b0..9f51839dfdf 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaArrayAnnotationArgumentImpl.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaArrayAnnotationArgumentImpl.java
@@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationArgument;
 import org.jetbrains.jet.lang.resolve.java.structure.JavaArrayAnnotationArgument;
 import org.jetbrains.jet.lang.resolve.name.Name;
 
-import java.util.Collection;
+import java.util.List;
 
 import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.namelessAnnotationArguments;
 
@@ -35,7 +35,7 @@ public class JavaArrayAnnotationArgumentImpl extends JavaAnnotationArgumentImpl<
 
     @Override
     @NotNull
-    public Collection<JavaAnnotationArgument> getElements() {
+    public List<JavaAnnotationArgument> getElements() {
         return namelessAnnotationArguments(getPsi().getInitializers());
     }
 }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java
index ec048ae39e6..b9e44d0cd10 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java
@@ -190,8 +190,8 @@ public class JavaElementCollectionFromPsiArrayUtil {
     }
 
     @NotNull
-    public static Collection<JavaAnnotationArgument> namelessAnnotationArguments(@NotNull PsiAnnotationMemberValue[] memberValues) {
-        return (Collection) convert(memberValues, Factories.NAMELESS_ANNOTATION_ARGUMENTS);
+    public static List<JavaAnnotationArgument> namelessAnnotationArguments(@NotNull PsiAnnotationMemberValue[] memberValues) {
+        return (List) convert(memberValues, Factories.NAMELESS_ANNOTATION_ARGUMENTS);
     }
 
     @NotNull
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationArgumentResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationArgumentResolver.java
index cfd0ef9dc25..2d7f5e6947b 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationArgumentResolver.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationArgumentResolver.java
@@ -35,7 +35,6 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 
 import javax.inject.Inject;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -110,7 +109,7 @@ public final class JavaAnnotationArgumentResolver {
     private CompileTimeConstant<?> resolveFromArray(
             @NotNull FqName annotationFqName,
             @NotNull Name argumentName,
-            @NotNull Collection<JavaAnnotationArgument> elements,
+            @NotNull List<JavaAnnotationArgument> elements,
             @NotNull PostponedTasks taskList
     ) {
         ClassDescriptor annotationClass = classResolver.resolveClass(annotationFqName, INCLUDE_KOTLIN_SOURCES, taskList);
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayAnnotationArgument.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayAnnotationArgument.java
index e64f30fe521..793a99e62cb 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayAnnotationArgument.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayAnnotationArgument.java
@@ -18,9 +18,9 @@ package org.jetbrains.jet.lang.resolve.java.structure;
 
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Collection;
+import java.util.List;
 
 public interface JavaArrayAnnotationArgument extends JavaAnnotationArgument {
     @NotNull
-    Collection<JavaAnnotationArgument> getElements();
+    List<JavaAnnotationArgument> getElements();
 }