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

Minor cleanup in Java model: fix warnings, remove unused

Browse Source
This commit is contained in:
Alexander Udalov
2016-03-17 20:39:12 +03:00
parent 0a54464420
commit 0d74fc2290
10 changed files with 23 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/ExternalAnnotationResolver.java
-12
View File
@@ -22,9 +22,6 @@ import org.jetbrains.kotlin.load.java.structure.JavaAnnotation;
import org.jetbrains.kotlin.load.java.structure.JavaAnnotationOwner;
import org.jetbrains.kotlin.name.FqName;
import java.util.Collection;
import java.util.Collections;
public interface ExternalAnnotationResolver {
ExternalAnnotationResolver EMPTY = new ExternalAnnotationResolver() {
@Nullable
@@ -32,17 +29,8 @@ public interface ExternalAnnotationResolver {
public JavaAnnotation findExternalAnnotation(@NotNull JavaAnnotationOwner owner, @NotNull FqName fqName) {
return null;
}
@NotNull
@Override
public Collection<JavaAnnotation> findExternalAnnotations(@NotNull JavaAnnotationOwner owner) {
return Collections.emptyList();
}
};
@Nullable
JavaAnnotation findExternalAnnotation(@NotNull JavaAnnotationOwner owner, @NotNull FqName fqName);
@NotNull
Collection<JavaAnnotation> findExternalAnnotations(@NotNull JavaAnnotationOwner owner);
}
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaAnnotation.java
-4
View File
@@ -19,14 +19,10 @@ package org.jetbrains.kotlin.load.java.structure;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.name.ClassId;
import org.jetbrains.kotlin.name.Name;
import java.util.Collection;
public interface JavaAnnotation extends JavaElement {
@Nullable
JavaAnnotationArgument findArgument(@NotNull Name name);
@NotNull
Collection<JavaAnnotationArgument> getArguments();