Rename: AnnotationDeserializer, ConstantDeserializer -> *Loader

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorLoader.java

@@ -21,7 +21,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.descriptors.serialization.JavaProtoBuf;
 import org.jetbrains.jet.descriptors.serialization.NameResolver;
 import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
-import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationDeserializer;
+import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationLoader;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptorImpl;
@@ -49,7 +49,7 @@ import java.util.Map;
 import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotatedCallableKind;
 import static org.jetbrains.jet.lang.resolve.kotlin.DescriptorDeserializersStorage.MemberSignature;
 
-public class AnnotationDescriptorDeserializer extends BaseDescriptorDeserializer implements AnnotationDeserializer {
+public class AnnotationDescriptorLoader extends BaseDescriptorLoader implements AnnotationLoader {
     @Inject
     @Override
     public void setStorage(@NotNull DescriptorDeserializersStorage storage) {

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BaseDescriptorLoader.java

@@ -38,7 +38,7 @@ import static org.jetbrains.jet.lang.resolve.kotlin.DescriptorDeserializersStora
 import static org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.kotlinFqNameToJavaFqName;
 import static org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.naiveKotlinFqName;
 
-public abstract class BaseDescriptorDeserializer {
+public abstract class BaseDescriptorLoader {
     protected DependencyClassByQualifiedNameResolver classResolver;
     protected KotlinClassFinder kotlinClassFinder;
     protected ErrorReporter errorReporter;

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/ConstantDescriptorLoader.java

@@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.descriptors.serialization.NameResolver;
 import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
-import org.jetbrains.jet.descriptors.serialization.descriptors.ConstantDeserializer;
+import org.jetbrains.jet.descriptors.serialization.descriptors.ConstantLoader;
 import org.jetbrains.jet.lang.descriptors.ClassOrPackageFragmentDescriptor;
 import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
 import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter;
@@ -31,7 +31,7 @@ import javax.inject.Inject;
 import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotatedCallableKind;
 import static org.jetbrains.jet.lang.resolve.kotlin.DescriptorDeserializersStorage.MemberSignature;
 
-public class ConstantDescriptorDeserializer extends BaseDescriptorDeserializer implements ConstantDeserializer {
+public class ConstantDescriptorLoader extends BaseDescriptorLoader implements ConstantLoader {
     @Inject
     @Override
     public void setStorage(@NotNull DescriptorDeserializersStorage storage) {

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DescriptorDeserializersStorage.java

@@ -108,7 +108,7 @@ public class DescriptorDeserializersStorage {
                         result = new ArrayList<AnnotationDescriptor>();
                         memberAnnotations.put(paramSignature, result);
                     }
-                    return AnnotationDescriptorDeserializer.resolveAnnotation(className, result, classResolver);
+                    return AnnotationDescriptorLoader.resolveAnnotation(className, result, classResolver);
                 }
             }
 
@@ -123,7 +123,7 @@ public class DescriptorDeserializersStorage {
                 @Nullable
                 @Override
                 public KotlinJvmBinaryClass.AnnotationArgumentVisitor visitAnnotation(@NotNull JvmClassName className) {
-                    return AnnotationDescriptorDeserializer.resolveAnnotation(className, result, classResolver);
+                    return AnnotationDescriptorLoader.resolveAnnotation(className, result, classResolver);
                 }
 
                 @Override

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializationGlobalContextForJava.kt

@@ -18,19 +18,14 @@ package org.jetbrains.jet.lang.resolve.kotlin
 
 import org.jetbrains.jet.descriptors.serialization.context.DeserializationGlobalContext
 import org.jetbrains.jet.storage.StorageManager
-import org.jetbrains.jet.descriptors.serialization.DescriptorFinder
-import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationDeserializer
-import org.jetbrains.jet.descriptors.serialization.descriptors.ConstantDeserializer
-import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider
 import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaPackageFragmentProvider
 import org.jetbrains.jet.descriptors.serialization.descriptors.MemberFilter
 
 public class DeserializationGlobalContextForJava(
         storageManager: StorageManager,
         descriptorFinder: JavaDescriptorFinder,
-        annotationDeserializer: AnnotationDescriptorDeserializer,
-        constantDeserializer: ConstantDescriptorDeserializer,
+        annotationLoader: AnnotationDescriptorLoader,
+        constantLoader: ConstantDescriptorLoader,
         packageFragmentProvider: LazyJavaPackageFragmentProvider,
         memberFilter: MemberFilter
-) : DeserializationGlobalContext(storageManager, descriptorFinder, annotationDeserializer,
-                                 constantDeserializer, packageFragmentProvider, memberFilter)
+) : DeserializationGlobalContext(storageManager, descriptorFinder, annotationLoader, constantLoader, packageFragmentProvider, memberFilter)