Rename KotlinClassFileHeader and related classes

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();
         }

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);
     }

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;
     }
 

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);
     }
 }

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);
         }

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