Rename: DescriptorDeserializersStorage -> DescriptorLoadersStorage

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

@@ -46,7 +46,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static org.jetbrains.jet.lang.resolve.kotlin.DescriptorDeserializersStorage.MemberSignature;
+import static org.jetbrains.jet.lang.resolve.kotlin.DescriptorLoadersStorage.MemberSignature;
 import static org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.javaFqNameToKotlinFqName;
 
 public class AnnotationDescriptorLoader extends BaseDescriptorLoader implements AnnotationLoader {
@@ -60,7 +60,7 @@ public class AnnotationDescriptorLoader extends BaseDescriptorLoader implements
 
     @Inject
     @Override
-    public void setStorage(@NotNull DescriptorDeserializersStorage storage) {
+    public void setStorage(@NotNull DescriptorLoadersStorage storage) {
         this.storage = storage;
     }
 

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

@@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.resolve.name.Name;
 
 import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isClassObject;
 import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isTrait;
-import static org.jetbrains.jet.lang.resolve.kotlin.DescriptorDeserializersStorage.MemberSignature;
+import static org.jetbrains.jet.lang.resolve.kotlin.DescriptorLoadersStorage.MemberSignature;
 import static org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.kotlinFqNameToJavaFqName;
 import static org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.naiveKotlinFqName;
 
@@ -41,13 +41,13 @@ public abstract class BaseDescriptorLoader {
     protected KotlinClassFinder kotlinClassFinder;
     protected ErrorReporter errorReporter;
 
-    protected DescriptorDeserializersStorage storage;
+    protected DescriptorLoadersStorage storage;
 
     public abstract void setKotlinClassFinder(@NotNull KotlinClassFinder kotlinClassFinder);
 
     public abstract void setErrorReporter(@NotNull ErrorReporter errorReporter);
 
-    public abstract void setStorage(@NotNull DescriptorDeserializersStorage storage);
+    public abstract void setStorage(@NotNull DescriptorLoadersStorage storage);
 
     @Nullable
     protected static MemberSignature getCallableSignature(

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

@@ -28,12 +28,12 @@ import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter;
 
 import javax.inject.Inject;
 
-import static org.jetbrains.jet.lang.resolve.kotlin.DescriptorDeserializersStorage.MemberSignature;
+import static org.jetbrains.jet.lang.resolve.kotlin.DescriptorLoadersStorage.MemberSignature;
 
 public class ConstantDescriptorLoader extends BaseDescriptorLoader implements ConstantLoader {
     @Inject
     @Override
-    public void setStorage(@NotNull DescriptorDeserializersStorage storage) {
+    public void setStorage(@NotNull DescriptorLoadersStorage storage) {
         this.storage = storage;
     }
 

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

@@ -33,13 +33,13 @@ import javax.inject.Inject;
 import java.io.IOException;
 import java.util.*;
 
-public class DescriptorDeserializersStorage {
+public class DescriptorLoadersStorage {
     private ErrorReporter errorReporter;
     private ModuleDescriptor module;
 
     private final MemoizedFunctionToNotNull<KotlinJvmBinaryClass, Storage> storage;
 
-    public DescriptorDeserializersStorage(@NotNull StorageManager storageManager) {
+    public DescriptorLoadersStorage(@NotNull StorageManager storageManager) {
         this.storage = storageManager.createMemoizedFunction(
                 new Function1<KotlinJvmBinaryClass, Storage>() {
                     @NotNull

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

@@ -48,8 +48,8 @@ public class SignatureDeserializer {
     }
 
     @NotNull
-    public DescriptorDeserializersStorage.MemberSignature methodSignature(@NotNull JavaProtoBuf.JavaMethodSignature signature) {
-        return DescriptorDeserializersStorage.MemberSignature.fromMethodNameAndDesc(methodSignatureString(signature));
+    public DescriptorLoadersStorage.MemberSignature methodSignature(@NotNull JavaProtoBuf.JavaMethodSignature signature) {
+        return DescriptorLoadersStorage.MemberSignature.fromMethodNameAndDesc(methodSignatureString(signature));
     }
 
     @NotNull