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
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 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);
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 java.util.Collection;
import java.util.List;
public interface JavaArrayAnnotationArgument extends JavaAnnotationArgument {
@NotNull
Collection<JavaAnnotationArgument> getElements();
List<JavaAnnotationArgument> getElements();
}