azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JavaMethod.getValueParameters() returns List

Browse Source
This commit is contained in:
Alexander Udalov
2013-10-15 20:07:51 +04:00
parent d52f2e25b0
commit 0958e63be2
4 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java
+5 -4
View File
@@ -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) {
return (Collection) convert(parameters, Factories.VALUE_PARAMETERS);
public static List<JavaValueParameter> valueParameters(@NotNull PsiParameter[] parameters) {
return (List) convert(parameters, Factories.VALUE_PARAMETERS);
}
@NotNull
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMethodImpl.java
+2 -1
View File
@@ -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());
}