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

Type parameters/arguments constitute lists, not collections

Browse Source
This commit is contained in:
Alexander Udalov
2013-10-15 20:14:53 +04:00
parent 0958e63be2
commit 5b916ea108
7 changed files with 18 additions and 18 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/JavaClassImpl.java
+2 -1
View File
@@ -30,6 +30,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
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.*;
@@ -83,7 +84,7 @@ public class JavaClassImpl extends JavaClassifierImpl<PsiClass> implements JavaC
@NotNull
@Override
public Collection<JavaTypeParameter> getTypeParameters() {
public List<JavaTypeParameter> getTypeParameters() {
return typeParameters(getPsi().getTypeParameters());
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierTypeImpl.java
+1 -1
View File
@@ -103,7 +103,7 @@ public class JavaClassifierTypeImpl extends JavaTypeImpl<PsiClassType> implement
@Override
@NotNull
public Collection<JavaType> getTypeArguments() {
public List<JavaType> getTypeArguments() {
return types(getPsi().getParameters());
}
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java
+4 -4
View File
@@ -170,13 +170,13 @@ public class JavaElementCollectionFromPsiArrayUtil {
}
@NotNull
public static Collection<JavaTypeParameter> typeParameters(@NotNull PsiTypeParameter[] typeParameters) {
return (Collection) convert(typeParameters, Factories.TYPE_PARAMETERS);
public static List<JavaTypeParameter> typeParameters(@NotNull PsiTypeParameter[] typeParameters) {
return (List) convert(typeParameters, Factories.TYPE_PARAMETERS);
}
@NotNull
public static Collection<JavaType> types(@NotNull PsiType[] types) {
return (Collection) convert(types, Factories.TYPES);
public static List<JavaType> types(@NotNull PsiType[] types) {
return (List) convert(types, Factories.TYPES);
}
@NotNull
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMethodImpl.java
+1 -2
View File
@@ -27,7 +27,6 @@ import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeParameter;
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;
@@ -46,7 +45,7 @@ public class JavaMethodImpl extends JavaMemberImpl<PsiMethod> implements JavaMet
@NotNull
@Override
public Collection<JavaTypeParameter> getTypeParameters() {
public List<JavaTypeParameter> getTypeParameters() {
return typeParameters(getPsi().getTypeParameters());
}