From 2486e744d7cc1968fa89de5068ab0488926435fb Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 1 Jun 2012 16:28:37 +0200
Subject: [PATCH] adapt to latest Kotlin

---
 src/org/jetbrains/jet/j2k/Converter.kt | 28 +++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/org/jetbrains/jet/j2k/Converter.kt b/src/org/jetbrains/jet/j2k/Converter.kt
index 0114bd8191a..452068878e7 100644
--- a/src/org/jetbrains/jet/j2k/Converter.kt
+++ b/src/org/jetbrains/jet/j2k/Converter.kt
@@ -469,20 +469,20 @@ public open class Converter() {
     class object {
         public val NOT_NULL_ANNOTATIONS: Set<String> = ImmutableSet.of<String>("org.jetbrains.annotations.NotNull", "com.sun.istack.internal.NotNull", "javax.annotation.Nonnull")!!
         private val PRIMITIVE_TYPE_CONVERSIONS: Map<String, String> = ImmutableMap.builder<String, String>()
-                ?.put("byte", BYTE)
-                ?.put("short", SHORT)
-                ?.put("int", INT)
-                ?.put("long", LONG)
-                ?.put("float", FLOAT)
-                ?.put("double", DOUBLE)
-                ?.put("char", CHAR)
-                ?.put(JAVA_LANG_BYTE, BYTE)
-                ?.put(JAVA_LANG_SHORT, SHORT)
-                ?.put(JAVA_LANG_INTEGER, INT)
-                ?.put(JAVA_LANG_LONG, LONG)
-                ?.put(JAVA_LANG_FLOAT, FLOAT)
-                ?.put(JAVA_LANG_DOUBLE, DOUBLE)
-                ?.put(JAVA_LANG_CHARACTER, CHAR)
+                ?.put("byte", BYTE.getName())
+                ?.put("short", SHORT.getName())
+                ?.put("int", INT.getName())
+                ?.put("long", LONG.getName())
+                ?.put("float", FLOAT.getName())
+                ?.put("double", DOUBLE.getName())
+                ?.put("char", CHAR.getName())
+                ?.put(JAVA_LANG_BYTE, BYTE.getName())
+                ?.put(JAVA_LANG_SHORT, SHORT.getName())
+                ?.put(JAVA_LANG_INTEGER, INT.getName())
+                ?.put(JAVA_LANG_LONG, LONG.getName())
+                ?.put(JAVA_LANG_FLOAT, FLOAT.getName())
+                ?.put(JAVA_LANG_DOUBLE, DOUBLE.getName())
+                ?.put(JAVA_LANG_CHARACTER, CHAR.getName())
                 ?.build()!!
 
         private fun quoteKeywords(packageName: String): String {