do not expose map
This commit is contained in:
+7
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user