From 3e9ef572eaa8b767104f6975153d0600fdc1895f Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Sun, 8 Apr 2012 02:08:25 +0400
Subject: [PATCH] hide another map from JavaTypeTransformer

---
 .../resolve/java/JavaTypeTransformer.java     | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java
index 8255e7e0292..96a3f99304e 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java
@@ -57,7 +57,7 @@ public class JavaTypeTransformer {
 
 
     private Map<String, JetType> primitiveTypesMap;
-    private Map<String, JetType> classTypesMap;
+    private Map<FqName, JetType> classTypesMap;
     private HashMap<FqName, ClassDescriptor> classDescriptorMap;
 
 
@@ -139,7 +139,7 @@ public class JavaTypeTransformer {
                     }
                 }
                 else {
-                    JetType jetAnalog = getClassTypesMap().get(psiClass.getQualifiedName());
+                    JetType jetAnalog = getKotlinAnalog(new FqName(psiClass.getQualifiedName()));
                     if (jetAnalog != null) {
                         return jetAnalog;
                     }
@@ -223,21 +223,26 @@ public class JavaTypeTransformer {
         return primitiveTypesMap;
     }
 
-    public Map<String, JetType> getClassTypesMap() {
+    public Map<FqName, JetType> getClassTypesMap() {
         if (classTypesMap == null) {
-            classTypesMap = new HashMap<String, JetType>();
+            classTypesMap = new HashMap<FqName, JetType>();
             for (JvmPrimitiveType jvmPrimitiveType : JvmPrimitiveType.values()) {
                 PrimitiveType primitiveType = jvmPrimitiveType.getPrimitiveType();
-                classTypesMap.put(jvmPrimitiveType.getWrapper().getFqName().getFqName(), JetStandardLibrary.getInstance().getNullablePrimitiveJetType(primitiveType));
+                classTypesMap.put(jvmPrimitiveType.getWrapper().getFqName(), JetStandardLibrary.getInstance().getNullablePrimitiveJetType(primitiveType));
             }
-            classTypesMap.put("java.lang.Object", JetStandardClasses.getNullableAnyType());
-            classTypesMap.put("java.lang.String", JetStandardLibrary.getInstance().getNullableStringType());
-            classTypesMap.put("java.lang.CharSequence", JetStandardLibrary.getInstance().getNullableCharSequenceType());
-            classTypesMap.put("java.lang.Throwable", JetStandardLibrary.getInstance().getNullableThrowableType());
+            classTypesMap.put(new FqName("java.lang.Object"), JetStandardClasses.getNullableAnyType());
+            classTypesMap.put(new FqName("java.lang.String"), JetStandardLibrary.getInstance().getNullableStringType());
+            classTypesMap.put(new FqName("java.lang.CharSequence"), JetStandardLibrary.getInstance().getNullableCharSequenceType());
+            classTypesMap.put(new FqName("java.lang.Throwable"), JetStandardLibrary.getInstance().getNullableThrowableType());
         }
         return classTypesMap;
     }
 
+    @Nullable
+    public JetType getKotlinAnalog(@NotNull FqName fqName) {
+        return getClassTypesMap().get(fqName);
+    }
+
     private Map<FqName, ClassDescriptor> getPrimitiveWrappersClassDescriptorMap() {
         if (classDescriptorMap == null) {
             classDescriptorMap = new HashMap<FqName, ClassDescriptor>();
-- 
GitLab