JavaMethod.getValueParameters() returns List

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java

@@ -24,6 +24,7 @@ import org.jetbrains.jet.lang.resolve.name.Name;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 
 @SuppressWarnings("unchecked")
 public class JavaElementCollectionFromPsiArrayUtil {
@@ -134,9 +135,9 @@ public class JavaElementCollectionFromPsiArrayUtil {
     }
 
     @NotNull
-    private static <Psi, Java> Collection<Java> convert(@NotNull Psi[] elements, @NotNull Factory<Psi, Java> factory) {
+    private static <Psi, Java> List<Java> convert(@NotNull Psi[] elements, @NotNull Factory<Psi, Java> factory) {
         if (elements.length == 0) return Collections.emptyList();
-        Collection<Java> result = new ArrayList<Java>(elements.length);
+        List<Java> result = new ArrayList<Java>(elements.length);
         for (Psi element : elements) {
             result.add(factory.create(element));
         }
@@ -164,8 +165,8 @@ public class JavaElementCollectionFromPsiArrayUtil {
     }
 
     @NotNull
-    public static Collection<JavaValueParameter> valueParameters(@NotNull PsiParameter[] parameters) {
+    public static List<JavaValueParameter> valueParameters(@NotNull PsiParameter[] parameters) {
-        return (Collection) convert(parameters, Factories.VALUE_PARAMETERS);
+        return (List) convert(parameters, Factories.VALUE_PARAMETERS);
     }
 
     @NotNull

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMethodImpl.java

@@ -28,6 +28,7 @@ import org.jetbrains.jet.lang.resolve.java.structure.JavaValueParameter;
 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.typeParameters;
 import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.valueParameters;
@@ -51,7 +52,7 @@ public class JavaMethodImpl extends JavaMemberImpl<PsiMethod> implements JavaMet
 
     @Override
     @NotNull
-    public Collection<JavaValueParameter> getValueParameters() {
+    public List<JavaValueParameter> getValueParameters() {
         return valueParameters(getPsi().getParameterList().getParameters());
     }
 

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaValueParameterResolver.java

@@ -32,7 +32,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;
 
@@ -106,12 +105,10 @@ public final class JavaValueParameterResolver {
             @NotNull JavaMethod method,
             @NotNull TypeVariableResolver typeVariableResolver
     ) {
-        Collection<JavaValueParameter> parameters = method.getValueParameters();
+        List<JavaValueParameter> parameters = method.getValueParameters();
         List<ValueParameterDescriptor> result = new ArrayList<ValueParameterDescriptor>(parameters.size());
-        int index = 0;
+        for (int i = 0, size = parameters.size(); i < size; i++) {
-        for (JavaValueParameter parameter : parameters) {
+            result.add(resolveValueParameter(container, i, parameters.get(i), typeVariableResolver));
-            result.add(resolveValueParameter(container, index, parameter, typeVariableResolver));
-            index++;
         }
         return result;
     }

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMethod.java

@@ -19,11 +19,11 @@ package org.jetbrains.jet.lang.resolve.java.structure;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Collection;
+import java.util.List;
 
 public interface JavaMethod extends JavaMember, JavaTypeParameterListOwner {
     @NotNull
-    Collection<JavaValueParameter> getValueParameters();
+    List<JavaValueParameter> getValueParameters();
 
     boolean hasAnnotationParameterDefaultValue();