Delete JvmClassName.getAsmType()

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

@@ -18,7 +18,6 @@ package org.jetbrains.jet.lang.resolve.java;
 
 import com.intellij.openapi.util.text.StringUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.asm4.Type;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 
 public class JvmClassName {
@@ -73,7 +72,6 @@ public class JvmClassName {
 
     private final String internalName;
     private FqName fqName;
-    private Type asmType;
 
     private JvmClassName(@NotNull String internalName) {
         this.internalName = internalName;
@@ -92,14 +90,6 @@ public class JvmClassName {
         return internalName;
     }
 
-    @NotNull
-    public Type getAsmType() {
-        if (asmType == null) {
-            asmType = Type.getType("L" + internalName + ';');
-        }
-        return asmType;
-    }
-
     @Override
     public String toString() {
         return getInternalName();

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

@@ -16,6 +16,8 @@
 
 package org.jetbrains.jet.lang.resolve.java;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.types.lang.PrimitiveType;
 
 public enum JvmPrimitiveType {
@@ -31,23 +33,26 @@ public enum JvmPrimitiveType {
     
     private final PrimitiveType primitiveType;
     private final String name;
-    private final JvmClassName wrapper;
+    private final FqName wrapperFqName;
 
-    private JvmPrimitiveType(PrimitiveType primitiveType, String name, String wrapperClassName) {
+    private JvmPrimitiveType(@NotNull PrimitiveType primitiveType, @NotNull String name, @NotNull String wrapperClassName) {
         this.primitiveType = primitiveType;
         this.name = name;
-        this.wrapper = JvmClassName.byFqNameWithoutInnerClasses(wrapperClassName);
+        this.wrapperFqName = new FqName(wrapperClassName);
     }
 
+    @NotNull
     public PrimitiveType getPrimitiveType() {
         return primitiveType;
     }
 
+    @NotNull
     public String getName() {
         return name;
     }
 
-    public JvmClassName getWrapper() {
-        return wrapper;
+    @NotNull
+    public FqName getWrapperFqName() {
+        return wrapperFqName;
     }
 }

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/mapping/JavaToKotlinClassMap.java

@@ -69,11 +69,12 @@ public class JavaToKotlinClassMap extends JavaToKotlinClassMapBuilder implements
         for (JvmPrimitiveType jvmPrimitiveType : JvmPrimitiveType.values()) {
             PrimitiveType primitiveType = jvmPrimitiveType.getPrimitiveType();
             String name = jvmPrimitiveType.getName();
-            register(jvmPrimitiveType.getWrapper().getFqName(), builtIns.getPrimitiveClassDescriptor(primitiveType));
+            FqName wrapperFqName = jvmPrimitiveType.getWrapperFqName();
+
+            register(wrapperFqName, builtIns.getPrimitiveClassDescriptor(primitiveType));
             primitiveTypesMap.put(name, builtIns.getPrimitiveJetType(primitiveType));
             primitiveTypesMap.put("[" + name, builtIns.getPrimitiveArrayJetType(primitiveType));
-            primitiveTypesMap.put(jvmPrimitiveType.getWrapper().getFqName().asString(), builtIns.getNullablePrimitiveJetType(
-                    primitiveType));
+            primitiveTypesMap.put(wrapperFqName.asString(), builtIns.getNullablePrimitiveJetType(primitiveType));
         }
         primitiveTypesMap.put("void", KotlinBuiltIns.getInstance().getUnitType());
     }