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

Minor, add NotNull annotations to VirtualFileKotlinClass

Browse Source
This commit is contained in:
Alexander Udalov
2014-09-12 18:30:32 +04:00
parent a8c5f1bb3a
commit f34f2e71a8
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.java
+12 -12
View File
@@ -55,12 +55,12 @@ public class VirtualFileKotlinClass implements KotlinJvmBinaryClass {
final Ref<JvmClassName> classNameRef = Ref.create(); final Ref<JvmClassName> classNameRef = Ref.create();
new ClassReader(fileContents).accept(new ClassVisitor(ASM5) { new ClassReader(fileContents).accept(new ClassVisitor(ASM5) {
@Override @Override
public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) { public void visit(int version, int access, @NotNull String name, String signature, String superName, String[] interfaces) {
classNameRef.set(JvmClassName.byInternalName(name)); classNameRef.set(JvmClassName.byInternalName(name));
} }
@Override @Override
public org.jetbrains.org.objectweb.asm.AnnotationVisitor visitAnnotation(String desc, boolean visible) { public org.jetbrains.org.objectweb.asm.AnnotationVisitor visitAnnotation(@NotNull String desc, boolean visible) {
return convertAnnotationVisitor(readHeaderVisitor, desc); return convertAnnotationVisitor(readHeaderVisitor, desc);
} }
@@ -125,7 +125,7 @@ public class VirtualFileKotlinClass implements KotlinJvmBinaryClass {
try { try {
new ClassReader(file.contentsToByteArray()).accept(new ClassVisitor(ASM5) { new ClassReader(file.contentsToByteArray()).accept(new ClassVisitor(ASM5) {
@Override @Override
public org.jetbrains.org.objectweb.asm.AnnotationVisitor visitAnnotation(String desc, boolean visible) { public org.jetbrains.org.objectweb.asm.AnnotationVisitor visitAnnotation(@NotNull String desc, boolean visible) {
return convertAnnotationVisitor(annotationVisitor, desc); return convertAnnotationVisitor(annotationVisitor, desc);
} }
@@ -151,7 +151,7 @@ public class VirtualFileKotlinClass implements KotlinJvmBinaryClass {
private static org.jetbrains.org.objectweb.asm.AnnotationVisitor convertAnnotationVisitor(@NotNull final AnnotationArgumentVisitor v) { private static org.jetbrains.org.objectweb.asm.AnnotationVisitor convertAnnotationVisitor(@NotNull final AnnotationArgumentVisitor v) {
return new org.jetbrains.org.objectweb.asm.AnnotationVisitor(ASM5) { return new org.jetbrains.org.objectweb.asm.AnnotationVisitor(ASM5) {
@Override @Override
public void visit(String name, Object value) { public void visit(String name, @NotNull Object value) {
v.visit(name == null ? null : Name.identifier(name), value); v.visit(name == null ? null : Name.identifier(name), value);
} }
@@ -160,12 +160,12 @@ public class VirtualFileKotlinClass implements KotlinJvmBinaryClass {
final AnnotationArrayArgumentVisitor arv = v.visitArray(Name.guess(name)); final AnnotationArrayArgumentVisitor arv = v.visitArray(Name.guess(name));
return arv == null ? null : new org.jetbrains.org.objectweb.asm.AnnotationVisitor(ASM5) { return arv == null ? null : new org.jetbrains.org.objectweb.asm.AnnotationVisitor(ASM5) {
@Override @Override
public void visit(String name, Object value) { public void visit(String name, @NotNull Object value) {
arv.visit(value); arv.visit(value);
} }
@Override @Override
public void visitEnum(String name, String desc, String value) { public void visitEnum(String name, @NotNull String desc, @NotNull String value) {
arv.visitEnum(classNameFromAsmDesc(desc), Name.identifier(value)); arv.visitEnum(classNameFromAsmDesc(desc), Name.identifier(value));
} }
@@ -177,7 +177,7 @@ public class VirtualFileKotlinClass implements KotlinJvmBinaryClass {
} }
@Override @Override
public void visitEnum(String name, String desc, String value) { public void visitEnum(String name, @NotNull String desc, @NotNull String value) {
v.visitEnum(Name.identifier(name), classNameFromAsmDesc(desc), Name.identifier(value)); v.visitEnum(Name.identifier(name), classNameFromAsmDesc(desc), Name.identifier(value));
} }
@@ -193,13 +193,13 @@ public class VirtualFileKotlinClass implements KotlinJvmBinaryClass {
try { try {
new ClassReader(file.contentsToByteArray()).accept(new ClassVisitor(ASM5) { new ClassReader(file.contentsToByteArray()).accept(new ClassVisitor(ASM5) {
@Override @Override
public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) { public FieldVisitor visitField(int access, @NotNull String name, @NotNull String desc, String signature, Object value) {
final AnnotationVisitor v = memberVisitor.visitField(Name.guess(name), desc, value); final AnnotationVisitor v = memberVisitor.visitField(Name.guess(name), desc, value);
if (v == null) return null; if (v == null) return null;
return new FieldVisitor(ASM5) { return new FieldVisitor(ASM5) {
@Override @Override
public org.jetbrains.org.objectweb.asm.AnnotationVisitor visitAnnotation(String desc, boolean visible) { public org.jetbrains.org.objectweb.asm.AnnotationVisitor visitAnnotation(@NotNull String desc, boolean visible) {
return convertAnnotationVisitor(v, desc); return convertAnnotationVisitor(v, desc);
} }
@@ -211,18 +211,18 @@ public class VirtualFileKotlinClass implements KotlinJvmBinaryClass {
} }
@Override @Override
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { public MethodVisitor visitMethod(int access, @NotNull String name, @NotNull String desc, String signature, String[] exceptions) {
final MethodAnnotationVisitor v = memberVisitor.visitMethod(Name.guess(name), desc); final MethodAnnotationVisitor v = memberVisitor.visitMethod(Name.guess(name), desc);
if (v == null) return null; if (v == null) return null;
return new MethodVisitor(ASM5) { return new MethodVisitor(ASM5) {
@Override @Override
public org.jetbrains.org.objectweb.asm.AnnotationVisitor visitAnnotation(String desc, boolean visible) { public org.jetbrains.org.objectweb.asm.AnnotationVisitor visitAnnotation(@NotNull String desc, boolean visible) {
return convertAnnotationVisitor(v, desc); return convertAnnotationVisitor(v, desc);
} }
@Override @Override
public org.jetbrains.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int parameter, String desc, boolean visible) { public org.jetbrains.org.objectweb.asm.AnnotationVisitor visitParameterAnnotation(int parameter, @NotNull String desc, boolean visible) {
AnnotationArgumentVisitor av = v.visitParameterAnnotation(parameter, classNameFromAsmDesc(desc)); AnnotationArgumentVisitor av = v.visitParameterAnnotation(parameter, classNameFromAsmDesc(desc));
return av == null ? null : convertAnnotationVisitor(av); return av == null ? null : convertAnnotationVisitor(av);
} }