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

KotlinClassHeader.read() removed

Browse Source
This commit is contained in:
Andrey Breslav
2014-01-07 20:33:33 +04:00
parent 8f8b85101e
commit ce18d5ad8c
3 changed files with 3 additions and 10 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
+2 -1
View File
@@ -27,6 +27,7 @@ import org.jetbrains.asm4.FieldVisitor;
import org.jetbrains.asm4.MethodVisitor; import org.jetbrains.asm4.MethodVisitor;
import org.jetbrains.jet.lang.resolve.java.JvmClassName; import org.jetbrains.jet.lang.resolve.java.JvmClassName;
import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader; import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader;
import org.jetbrains.jet.lang.resolve.kotlin.header.ReadKotlinClassHeaderAnnotationVisitor;
import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.storage.NotNullLazyValue; import org.jetbrains.jet.storage.NotNullLazyValue;
import org.jetbrains.jet.storage.NullableLazyValue; import org.jetbrains.jet.storage.NullableLazyValue;
@@ -57,7 +58,7 @@ public class VirtualFileKotlinClass implements KotlinJvmBinaryClass {
new Function0<KotlinClassHeader>() { new Function0<KotlinClassHeader>() {
@Override @Override
public KotlinClassHeader invoke() { public KotlinClassHeader invoke() {
return KotlinClassHeader.read(VirtualFileKotlinClass.this); return ReadKotlinClassHeaderAnnotationVisitor.read(VirtualFileKotlinClass.this);
} }
} }
); );
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/KotlinClassHeader.java
-8
View File
@@ -16,15 +16,7 @@
package org.jetbrains.jet.lang.resolve.kotlin.header; package org.jetbrains.jet.lang.resolve.kotlin.header;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass;
public abstract class KotlinClassHeader { public abstract class KotlinClassHeader {
@Nullable
public static KotlinClassHeader read(@NotNull KotlinJvmBinaryClass kotlinClass) {
return ReadKotlinClassHeaderAnnotationVisitor.read(kotlinClass);
}
private final int version; private final int version;
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java
+1 -1
View File
@@ -32,7 +32,7 @@ import static org.jetbrains.jet.lang.resolve.java.AbiVersionUtil.isAbiVersionCom
import static org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass.AnnotationArgumentVisitor; import static org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass.AnnotationArgumentVisitor;
import static org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass.AnnotationVisitor; import static org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass.AnnotationVisitor;
/* package */ class ReadKotlinClassHeaderAnnotationVisitor implements AnnotationVisitor { public class ReadKotlinClassHeaderAnnotationVisitor implements AnnotationVisitor {
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
private enum HeaderType { private enum HeaderType {
CLASS(JvmAnnotationNames.KOTLIN_CLASS), CLASS(JvmAnnotationNames.KOTLIN_CLASS),