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 0561ff4a96d..7d0e37c514c 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 @@ -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 Collection convert(@NotNull Psi[] elements, @NotNull Factory factory) { + private static List convert(@NotNull Psi[] elements, @NotNull Factory factory) { if (elements.length == 0) return Collections.emptyList(); - Collection result = new ArrayList(elements.length); + List result = new ArrayList(elements.length); for (Psi element : elements) { result.add(factory.create(element)); } @@ -164,8 +165,8 @@ public class JavaElementCollectionFromPsiArrayUtil { } @NotNull - public static Collection valueParameters(@NotNull PsiParameter[] parameters) { - return (Collection) convert(parameters, Factories.VALUE_PARAMETERS); + public static List valueParameters(@NotNull PsiParameter[] parameters) { + return (List) convert(parameters, Factories.VALUE_PARAMETERS); } @NotNull diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMethodImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMethodImpl.java index fd308e76480..67731d0fc82 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMethodImpl.java +++ b/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 implements JavaMet @Override @NotNull - public Collection getValueParameters() { + public List getValueParameters() { return valueParameters(getPsi().getParameterList().getParameters()); } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaValueParameterResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaValueParameterResolver.java index 2eaaeee973e..6b3e8f43761 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaValueParameterResolver.java +++ b/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 parameters = method.getValueParameters(); + List parameters = method.getValueParameters(); List result = new ArrayList(parameters.size()); - int index = 0; - for (JavaValueParameter parameter : parameters) { - result.add(resolveValueParameter(container, index, parameter, typeVariableResolver)); - index++; + for (int i = 0, size = parameters.size(); i < size; i++) { + result.add(resolveValueParameter(container, i, parameters.get(i), typeVariableResolver)); } return result; } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMethod.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMethod.java index 3d90f56e669..279a80a9cbf 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMethod.java +++ b/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 getValueParameters(); + List getValueParameters(); boolean hasAnnotationParameterDefaultValue();