diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliVirtualFileFinder.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliVirtualFileFinder.java index 9b2ba279596..14769a89378 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliVirtualFileFinder.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliVirtualFileFinder.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder; import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClass; -import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassFileHeader; +import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader; import org.jetbrains.jet.lang.resolve.name.FqName; public class CliVirtualFileFinder implements VirtualFileFinder { @@ -71,7 +71,7 @@ public class CliVirtualFileFinder implements VirtualFileFinder { return null; } //NOTE: currently we use VirtualFileFinder to find Kotlin binaries only - if (KotlinClassFileHeader.readKotlinHeaderFromClassFile(new VirtualFileKotlinClass(vFile)) != null) { + if (KotlinClassHeader.read(new VirtualFileKotlinClass(vFile)) != null) { return vFile; } } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java index 72f5cc17098..cc4c45921c0 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java @@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter; import org.jetbrains.jet.lang.resolve.java.resolver.JavaClassResolver; import org.jetbrains.jet.lang.resolve.java.resolver.JavaNamespaceResolver; -import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassFileHeader; +import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader; import org.jetbrains.jet.lang.resolve.kotlin.header.SerializedDataHeader; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; @@ -110,7 +110,7 @@ public final class DeserializedDescriptorResolver { @Nullable private String[] readData(@NotNull KotlinJvmBinaryClass kotlinClass) { - KotlinClassFileHeader header = KotlinClassFileHeader.readKotlinHeaderFromClassFile(kotlinClass); + KotlinClassHeader header = KotlinClassHeader.read(kotlinClass); if (header instanceof SerializedDataHeader) { return ((SerializedDataHeader) header).getAnnotationData(); } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/IncompatibleAnnotationHeader.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/IncompatibleAnnotationHeader.java index ffbb056f742..3d97707d26f 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/IncompatibleAnnotationHeader.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/IncompatibleAnnotationHeader.java @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve.kotlin.header; -public class IncompatibleAnnotationHeader extends KotlinClassFileHeader { +public class IncompatibleAnnotationHeader extends KotlinClassHeader { protected IncompatibleAnnotationHeader(int version) { super(version); } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/KotlinClassFileHeader.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/KotlinClassHeader.java similarity index 77% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/KotlinClassFileHeader.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/KotlinClassHeader.java index 2b2c5817dc3..f884543547c 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/KotlinClassFileHeader.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/KotlinClassHeader.java @@ -20,15 +20,15 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass; -public abstract class KotlinClassFileHeader { +public abstract class KotlinClassHeader { @Nullable - public static KotlinClassFileHeader readKotlinHeaderFromClassFile(@NotNull KotlinJvmBinaryClass kotlinClass) { - return ReadDataFromAnnotationVisitor.read(kotlinClass); + public static KotlinClassHeader read(@NotNull KotlinJvmBinaryClass kotlinClass) { + return ReadKotlinClassHeaderAnnotationVisitor.read(kotlinClass); } private final int version; - protected KotlinClassFileHeader(int version) { + protected KotlinClassHeader(int version) { this.version = version; } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/PackageFragmentClassFileHeader.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/PackageFragmentClassHeader.java similarity index 83% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/PackageFragmentClassFileHeader.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/PackageFragmentClassHeader.java index e379eadaec4..ea41901e8d6 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/PackageFragmentClassFileHeader.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/PackageFragmentClassHeader.java @@ -16,8 +16,8 @@ package org.jetbrains.jet.lang.resolve.kotlin.header; -public class PackageFragmentClassFileHeader extends KotlinClassFileHeader { - protected PackageFragmentClassFileHeader(int version) { +public class PackageFragmentClassHeader extends KotlinClassHeader { + protected PackageFragmentClassHeader(int version) { super(version); } } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/ReadDataFromAnnotationVisitor.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java similarity index 95% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/ReadDataFromAnnotationVisitor.java rename to core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java index e77e22a3fbd..b2ef4813e9e 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/ReadDataFromAnnotationVisitor.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java @@ -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.AnnotationVisitor; -/* package */ class ReadDataFromAnnotationVisitor implements AnnotationVisitor { +/* package */ class ReadKotlinClassHeaderAnnotationVisitor implements AnnotationVisitor { @SuppressWarnings("deprecation") private enum HeaderType { CLASS(JvmAnnotationNames.KOTLIN_CLASS), @@ -65,18 +65,18 @@ import static org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass.Annotat @Nullable private HeaderType foundType = null; - private ReadDataFromAnnotationVisitor() { + private ReadKotlinClassHeaderAnnotationVisitor() { } @Nullable - public static KotlinClassFileHeader read(@NotNull KotlinJvmBinaryClass kotlinClass) { - ReadDataFromAnnotationVisitor visitor = new ReadDataFromAnnotationVisitor(); + public static KotlinClassHeader read(@NotNull KotlinJvmBinaryClass kotlinClass) { + ReadKotlinClassHeaderAnnotationVisitor visitor = new ReadKotlinClassHeaderAnnotationVisitor(); kotlinClass.loadClassAnnotations(visitor); return visitor.createHeader(); } @Nullable - public KotlinClassFileHeader createHeader() { + public KotlinClassHeader createHeader() { if (foundType == null) { return null; } @@ -91,7 +91,7 @@ import static org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass.Annotat case PACKAGE: return serializedDataHeader(SerializedDataHeader.Kind.PACKAGE); case PACKAGE_FRAGMENT: - return new PackageFragmentClassFileHeader(version); + return new PackageFragmentClassHeader(version); default: throw new UnsupportedOperationException("Unknown compatible HeaderType: " + foundType); } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/SerializedDataHeader.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/SerializedDataHeader.java index 4aa97605822..74cd0e90711 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/SerializedDataHeader.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/SerializedDataHeader.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.kotlin.header; import org.jetbrains.annotations.NotNull; -public class SerializedDataHeader extends KotlinClassFileHeader { +public class SerializedDataHeader extends KotlinClassHeader { public enum Kind { CLASS, PACKAGE diff --git a/idea/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java b/idea/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java index 148ebb8e87f..1f5ae9def21 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.descriptors.serialization.*; import org.jetbrains.jet.lang.descriptors.ClassKind; import org.jetbrains.jet.lang.resolve.java.JavaResolverPsiUtils; import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClass; -import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassFileHeader; +import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader; import org.jetbrains.jet.lang.resolve.kotlin.header.SerializedDataHeader; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; @@ -117,7 +117,7 @@ public class JetFromJavaDescriptorHelper { private static String[] getAnnotationDataForKotlinClass(@NotNull PsiClass psiClass) { VirtualFile virtualFile = getVirtualFileForPsiClass(psiClass); if (virtualFile != null) { - KotlinClassFileHeader header = KotlinClassFileHeader.readKotlinHeaderFromClassFile(new VirtualFileKotlinClass(virtualFile)); + KotlinClassHeader header = KotlinClassHeader.read(new VirtualFileKotlinClass(virtualFile)); if (header instanceof SerializedDataHeader) { return ((SerializedDataHeader) header).getAnnotationData(); } diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java index b34f54da51c..6b4725d0d5c 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java @@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.MemberComparator; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClass; -import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassFileHeader; +import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader; import org.jetbrains.jet.lang.resolve.kotlin.header.SerializedDataHeader; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.renderer.DescriptorRenderer; @@ -68,7 +68,7 @@ public final class DecompiledDataFactory { VirtualFileKotlinClass kotlinClass = new VirtualFileKotlinClass(classFile); this.classFqName = kotlinClass.getClassName().getFqNameForClassNameWithoutDollars(); - KotlinClassFileHeader header = KotlinClassFileHeader.readKotlinHeaderFromClassFile(kotlinClass); + KotlinClassHeader header = KotlinClassHeader.read(kotlinClass); assert header instanceof SerializedDataHeader : "Decompiled data factory shouldn't be called on an unsupported file: " + classFile; this.classFileHeader = (SerializedDataHeader) header; } diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledUtils.java b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledUtils.java index 4a12db214b1..bb2c7a8c5d1 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledUtils.java @@ -20,7 +20,7 @@ import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClass; -import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassFileHeader; +import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader; import org.jetbrains.jet.lang.resolve.kotlin.header.SerializedDataHeader; public final class DecompiledUtils { @@ -30,7 +30,7 @@ public final class DecompiledUtils { return false; } //TODO: check index - return KotlinClassFileHeader.readKotlinHeaderFromClassFile(new VirtualFileKotlinClass(file)) instanceof SerializedDataHeader; + return KotlinClassHeader.read(new VirtualFileKotlinClass(file)) instanceof SerializedDataHeader; } private DecompiledUtils() { diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/builder/EmptyPackageFragmentClsStubBuilderFactory.java b/idea/src/org/jetbrains/jet/plugin/stubindex/builder/EmptyPackageFragmentClsStubBuilderFactory.java index cf89042a635..45d088a1ae7 100644 --- a/idea/src/org/jetbrains/jet/plugin/stubindex/builder/EmptyPackageFragmentClsStubBuilderFactory.java +++ b/idea/src/org/jetbrains/jet/plugin/stubindex/builder/EmptyPackageFragmentClsStubBuilderFactory.java @@ -26,8 +26,8 @@ import com.intellij.util.cls.ClsFormatException; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClass; -import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassFileHeader; -import org.jetbrains.jet.lang.resolve.kotlin.header.PackageFragmentClassFileHeader; +import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader; +import org.jetbrains.jet.lang.resolve.kotlin.header.PackageFragmentClassHeader; /** * This class is needed to build an empty PSI stub for compiled package fragment classes. This results in these classes not showing up @@ -44,8 +44,7 @@ public class EmptyPackageFragmentClsStubBuilderFactory extends ClsStubBuilderFac public boolean canBeProcessed(VirtualFile file, byte[] bytes) { if (file.getName().contains(PackageClassUtils.PACKAGE_CLASS_NAME_SUFFIX + "-") && StdFileTypes.CLASS.getDefaultExtension().equals(file.getExtension())) { - KotlinClassFileHeader header = KotlinClassFileHeader.readKotlinHeaderFromClassFile(new VirtualFileKotlinClass(file)); - return header instanceof PackageFragmentClassFileHeader; + return KotlinClassHeader.read(new VirtualFileKotlinClass(file)) instanceof PackageFragmentClassHeader; } return false; } diff --git a/idea/src/org/jetbrains/jet/plugin/vfilefinder/KotlinClassFileIndex.java b/idea/src/org/jetbrains/jet/plugin/vfilefinder/KotlinClassFileIndex.java index 920dd163a62..11854e86783 100644 --- a/idea/src/org/jetbrains/jet/plugin/vfilefinder/KotlinClassFileIndex.java +++ b/idea/src/org/jetbrains/jet/plugin/vfilefinder/KotlinClassFileIndex.java @@ -24,7 +24,7 @@ import com.intellij.util.io.KeyDescriptor; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClass; import org.jetbrains.jet.lang.resolve.kotlin.header.IncompatibleAnnotationHeader; -import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassFileHeader; +import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader; import org.jetbrains.jet.lang.resolve.name.FqName; import java.io.DataInput; @@ -76,7 +76,7 @@ public final class KotlinClassFileIndex extends ScalarIndexExtension { public Map map(FileContent inputData) { try { VirtualFileKotlinClass kotlinClass = new VirtualFileKotlinClass(inputData.getFile()); - KotlinClassFileHeader header = KotlinClassFileHeader.readKotlinHeaderFromClassFile(kotlinClass); + KotlinClassHeader header = KotlinClassHeader.read(kotlinClass); if (header != null && !(header instanceof IncompatibleAnnotationHeader)) { return Collections.singletonMap(kotlinClass.getClassName().getFqNameForClassNameWithoutDollars(), null); }