JavaArrayAnnotationArgument.getElements() returns List
This commit is contained in:
+2
-2
@@ -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());
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
+1
-2
@@ -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);
|
||||
|
||||
+2
-2
@@ -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();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user