From 498d444a0a8846ffb00689e42a3007cb643540ef Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Sat, 7 Apr 2012 06:32:19 +0400
Subject: [PATCH] do not expose map

---
 .../jet/lang/resolve/java/JavaTypeTransformer.java        | 8 +++++++-
 .../jet/lang/resolve/java/JetTypeJetSignatureReader.java  | 2 +-
 2 files changed, 8 insertions(+), 2 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 3177975c88c..8255e7e0292 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
@@ -19,6 +19,7 @@ package org.jetbrains.jet.lang.resolve.java;
 import com.google.common.collect.Lists;
 import com.intellij.psi.*;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
@@ -237,7 +238,7 @@ public class JavaTypeTransformer {
         return classTypesMap;
     }
 
-    public Map<FqName, ClassDescriptor> getPrimitiveWrappersClassDescriptorMap() {
+    private Map<FqName, ClassDescriptor> getPrimitiveWrappersClassDescriptorMap() {
         if (classDescriptorMap == null) {
             classDescriptorMap = new HashMap<FqName, ClassDescriptor>();
             for (JvmPrimitiveType jvmPrimitiveType : JvmPrimitiveType.values()) {
@@ -251,6 +252,11 @@ public class JavaTypeTransformer {
         return classDescriptorMap;
     }
 
+    @Nullable
+    public ClassDescriptor unwrapPrimitive(@NotNull FqName fqName) {
+        return getPrimitiveWrappersClassDescriptorMap().get(fqName);
+    }
+
     /**
      * We convert Java types differently, depending on where they occur in the Java code
      * This enum encodes the kinds of occurrences
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetTypeJetSignatureReader.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetTypeJetSignatureReader.java
index aa57aad2033..2702b0fb403 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetTypeJetSignatureReader.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetTypeJetSignatureReader.java
@@ -93,7 +93,7 @@ public abstract class JetTypeJetSignatureReader extends JetSignatureExceptionsAd
         
         this.classDescriptor = null;
         if (this.classDescriptor == null && !forceReal) {
-            this.classDescriptor = this.javaSemanticServices.getTypeTransformer().getPrimitiveWrappersClassDescriptorMap().get(ourName);
+            this.classDescriptor = this.javaSemanticServices.getTypeTransformer().unwrapPrimitive(ourName);
         }
 
         if (this.classDescriptor == null && ourName.equals(new FqName("java.lang.Object")) && !forceReal) {