From 4a37c130df15546e39413cee855fc2e23fee7f28 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Tue, 13 Nov 2012 19:08:57 +0400
Subject: [PATCH] Minor. Better name for CollectionClassMapping class.

---
 ...llectionsMap.java => CollectionClassMapping.java} | 10 +++++-----
 .../java/kotlinSignature/SignaturesPropagation.java  | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)
 rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/{MutableReadOnlyCollectionsMap.java => CollectionClassMapping.java} (87%)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/MutableReadOnlyCollectionsMap.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/CollectionClassMapping.java
similarity index 87%
rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/MutableReadOnlyCollectionsMap.java
rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/CollectionClassMapping.java
index 1ece60478dc..cf33a29eac9 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/MutableReadOnlyCollectionsMap.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/CollectionClassMapping.java
@@ -20,13 +20,13 @@ import com.google.common.collect.ImmutableBiMap;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 
-public class MutableReadOnlyCollectionsMap extends JavaToKotlinClassMapBuilder {
-    private static MutableReadOnlyCollectionsMap instance = null;
+public class CollectionClassMapping extends JavaToKotlinClassMapBuilder {
+    private static CollectionClassMapping instance = null;
 
     @NotNull
-    public static MutableReadOnlyCollectionsMap getInstance() {
+    public static CollectionClassMapping getInstance() {
         if (instance == null) {
-            instance = new MutableReadOnlyCollectionsMap();
+            instance = new CollectionClassMapping();
         }
         return instance;
     }
@@ -34,7 +34,7 @@ public class MutableReadOnlyCollectionsMap extends JavaToKotlinClassMapBuilder {
     private ImmutableBiMap.Builder<ClassDescriptor, ClassDescriptor> mapBuilder = ImmutableBiMap.builder();
     private final ImmutableBiMap<ClassDescriptor, ClassDescriptor> mutableToReadOnlyMap;
 
-    private MutableReadOnlyCollectionsMap() {
+    private CollectionClassMapping() {
         init();
         mutableToReadOnlyMap = mapBuilder.build();
         mapBuilder = null;
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagation.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagation.java
index a003ddd1dc0..253e18dd487 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagation.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagation.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
-import org.jetbrains.jet.lang.resolve.java.MutableReadOnlyCollectionsMap;
+import org.jetbrains.jet.lang.resolve.java.CollectionClassMapping;
 import org.jetbrains.jet.lang.resolve.java.JavaToKotlinClassMap;
 import org.jetbrains.jet.lang.resolve.java.wrapper.PsiMethodWrapper;
 import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -235,9 +235,9 @@ public class SignaturesPropagation {
         }
         ClassDescriptor clazz = (ClassDescriptor) classifier;
 
-        MutableReadOnlyCollectionsMap collectionsMap = MutableReadOnlyCollectionsMap.getInstance();
+        CollectionClassMapping collectionMapping = CollectionClassMapping.getInstance();
 
-        if (collectionsMap.isMutableCollection(clazz)) {
+        if (collectionMapping.isMutableCollection(clazz)) {
 
             boolean someSupersMutable = false;
             boolean someSupersReadOnly = false;
@@ -246,17 +246,17 @@ public class SignaturesPropagation {
                 if (classifierFromSuper instanceof ClassDescriptor) {
                     ClassDescriptor classFromSuper = (ClassDescriptor) classifierFromSuper;
 
-                    if (collectionsMap.isMutableCollection(classFromSuper)) {
+                    if (collectionMapping.isMutableCollection(classFromSuper)) {
                         someSupersMutable = true;
                     }
-                    else if (collectionsMap.isReadOnlyCollection(classFromSuper)) {
+                    else if (collectionMapping.isReadOnlyCollection(classFromSuper)) {
                         someSupersReadOnly = true;
                     }
                 }
             }
 
             if (someSupersReadOnly && !someSupersMutable) {
-                return collectionsMap.convertMutableToReadOnly(clazz);
+                return collectionMapping.convertMutableToReadOnly(clazz);
             }
         }
         return classifier;