From dfae4b606b240e0d0baec292d8491e2afc52ebf9 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Wed, 22 May 2013 20:51:23 +0400
Subject: [PATCH] Fixed references after renaming Name.getName()->asString()

---
 src/org/jetbrains/jet/j2k/Converter.kt        | 28 +++++++++----------
 .../jet/j2k/visitors/ExpressionVisitor.kt     |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/org/jetbrains/jet/j2k/Converter.kt b/src/org/jetbrains/jet/j2k/Converter.kt
index 979d0752c82..e69535a5a2d 100644
--- a/src/org/jetbrains/jet/j2k/Converter.kt
+++ b/src/org/jetbrains/jet/j2k/Converter.kt
@@ -522,20 +522,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")!!
         public val PRIMITIVE_TYPE_CONVERSIONS: Map<String, String> = ImmutableMap.builder<String, String>()
-                ?.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())
+                ?.put("byte", BYTE.asString())
+                ?.put("short", SHORT.asString())
+                ?.put("int", INT.asString())
+                ?.put("long", LONG.asString())
+                ?.put("float", FLOAT.asString())
+                ?.put("double", DOUBLE.asString())
+                ?.put("char", CHAR.asString())
+                ?.put(JAVA_LANG_BYTE, BYTE.asString())
+                ?.put(JAVA_LANG_SHORT, SHORT.asString())
+                ?.put(JAVA_LANG_INTEGER, INT.asString())
+                ?.put(JAVA_LANG_LONG, LONG.asString())
+                ?.put(JAVA_LANG_FLOAT, FLOAT.asString())
+                ?.put(JAVA_LANG_DOUBLE, DOUBLE.asString())
+                ?.put(JAVA_LANG_CHARACTER, CHAR.asString())
                 ?.build()!!
 
         private fun quoteKeywords(packageName: String): String {
diff --git a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt
index 14d798063da..d605f9e6316 100644
--- a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt
+++ b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt
@@ -239,7 +239,7 @@ public open class ExpressionVisitor(converter: Converter): StatementVisitor(conv
             if (resolved is PsiClass) {
                 val clazz = resolved as PsiClass
 
-                if (PrimitiveType.values() any { it.getTypeName().getName() == clazz.getName() }) {
+                if (PrimitiveType.values() any { it.getTypeName().asString() == clazz.getName() }) {
                     myResult = Identifier(clazz.getQualifiedName()!!, false)
                     return
                 }