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

JavaArrayAnnotationArgument.getElements() returns List

Browse Source
This commit is contained in:
Alexander Udalov
2013-10-15 20:21:00 +04:00
parent 5b916ea108
commit 1fdb86f733
4 changed files with 7 additions and 8 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/JavaArrayAnnotationArgumentImpl.java
+2 -2
View File
@@ -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.java.structure.JavaArrayAnnotationArgument;
import org.jetbrains.jet.lang.resolve.name.Name; 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; import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.namelessAnnotationArguments;
@@ -35,7 +35,7 @@ public class JavaArrayAnnotationArgumentImpl extends JavaAnnotationArgumentImpl<
@Override @Override
@NotNull @NotNull
public Collection<JavaAnnotationArgument> getElements() { public List<JavaAnnotationArgument> getElements() {
return namelessAnnotationArguments(getPsi().getInitializers()); return namelessAnnotationArguments(getPsi().getInitializers());
} }
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java
+2 -2
View File
@@ -190,8 +190,8 @@ public class JavaElementCollectionFromPsiArrayUtil {
} }
@NotNull @NotNull
public static Collection<JavaAnnotationArgument> namelessAnnotationArguments(@NotNull PsiAnnotationMemberValue[] memberValues) { public static List<JavaAnnotationArgument> namelessAnnotationArguments(@NotNull PsiAnnotationMemberValue[] memberValues) {
return (Collection) convert(memberValues, Factories.NAMELESS_ANNOTATION_ARGUMENTS); return (List) convert(memberValues, Factories.NAMELESS_ANNOTATION_ARGUMENTS);
} }
@NotNull @NotNull
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationArgumentResolver.java
+1 -2
View File
@@ -35,7 +35,6 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import javax.inject.Inject; import javax.inject.Inject;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@@ -110,7 +109,7 @@ public final class JavaAnnotationArgumentResolver {
private CompileTimeConstant<?> resolveFromArray( private CompileTimeConstant<?> resolveFromArray(
@NotNull FqName annotationFqName, @NotNull FqName annotationFqName,
@NotNull Name argumentName, @NotNull Name argumentName,
@NotNull Collection<JavaAnnotationArgument> elements, @NotNull List<JavaAnnotationArgument> elements,
@NotNull PostponedTasks taskList @NotNull PostponedTasks taskList
) { ) {
ClassDescriptor annotationClass = classResolver.resolveClass(annotationFqName, INCLUDE_KOTLIN_SOURCES, taskList); ClassDescriptor annotationClass = classResolver.resolveClass(annotationFqName, INCLUDE_KOTLIN_SOURCES, taskList);
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayAnnotationArgument.java
+2 -2
View File
@@ -18,9 +18,9 @@ package org.jetbrains.jet.lang.resolve.java.structure;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.Collection; import java.util.List;
public interface JavaArrayAnnotationArgument extends JavaAnnotationArgument { public interface JavaArrayAnnotationArgument extends JavaAnnotationArgument {
@NotNull @NotNull
Collection<JavaAnnotationArgument> getElements(); List<JavaAnnotationArgument> getElements();
} }