From e5c77d12429afd874cdfcb61dece619589fc6b66 Mon Sep 17 00:00:00 2001
From: Michael Nedzelsky <Michael.Nedzelsky@jetbrains.com>
Date: Fri, 10 Oct 2014 16:43:47 +0400
Subject: [PATCH] JS backend: minor: move constant to Namer

---
 .../org/jetbrains/k2js/translate/context/Namer.java  |  1 +
 .../jetbrains/k2js/translate/utils/JsAstUtils.java   | 12 ++++--------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/Namer.java b/js/js.translator/src/org/jetbrains/k2js/translate/context/Namer.java
index 437c1c92a13..f8b57ffcb72 100644
--- a/js/js.translator/src/org/jetbrains/k2js/translate/context/Namer.java
+++ b/js/js.translator/src/org/jetbrains/k2js/translate/context/Namer.java
@@ -34,6 +34,7 @@ public final class Namer {
     public static final String KOTLIN_NAME = JetLanguage.NAME;
     public static final String KOTLIN_LOWER_NAME = KOTLIN_NAME.toLowerCase();
     public static final JsNameRef KOTLIN_OBJECT_REF = new JsNameRef(KOTLIN_NAME);
+    public static final JsNameRef KOTLIN_LONG_NAME_REF = new JsNameRef("Long", KOTLIN_OBJECT_REF);
 
     public static final String EQUALS_METHOD_NAME = getStableMangledNameForDescriptor(KotlinBuiltIns.getInstance().getAny(), "equals");
     public static final String COMPARE_TO_METHOD_NAME = getStableMangledNameForDescriptor(KotlinBuiltIns.getInstance().getComparable(), "compareTo");
diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsAstUtils.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsAstUtils.java
index d309b212ec6..95c5b17c086 100644
--- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsAstUtils.java
+++ b/js/js.translator/src/org/jetbrains/k2js/translate/utils/JsAstUtils.java
@@ -24,7 +24,6 @@ import org.jetbrains.jet.lang.types.expressions.OperatorConventions;
 import org.jetbrains.k2js.translate.context.Namer;
 import org.jetbrains.k2js.translate.context.TranslationContext;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -197,12 +196,9 @@ public final class JsAstUtils {
         return rangeTo(Namer.CHAR_RANGE, rangeStart, rangeEnd);
     }
 
-    @NotNull
-    public static final JsNameRef kotlinLongNameRef = new JsNameRef("Long", Namer.KOTLIN_OBJECT_REF);
-
     @NotNull
     public static JsExpression isLong(@NotNull JsExpression expression) {
-        return instanceOf(expression, kotlinLongNameRef);
+        return instanceOf(expression, Namer.KOTLIN_LONG_NAME_REF);
     }
 
     public static JsExpression newLong(long value, @NotNull TranslationContext context) {
@@ -212,7 +208,7 @@ public final class JsAstUtils {
             List<JsExpression> args = new SmartList<JsExpression>();
             args.add(context.program().getNumberLiteral(low));
             args.add(context.program().getNumberLiteral(high));
-            return new JsNew(kotlinLongNameRef, args);
+            return new JsNew(Namer.KOTLIN_LONG_NAME_REF, args);
         }
         else {
             return longFromInt(context.program().getNumberLiteral((int) value));
@@ -221,12 +217,12 @@ public final class JsAstUtils {
 
     @NotNull
     public static JsExpression longFromInt(@NotNull JsExpression expression) {
-        return invokeMethod(kotlinLongNameRef, Namer.LONG_FROM_INT, expression);
+        return invokeMethod(Namer.KOTLIN_LONG_NAME_REF, Namer.LONG_FROM_INT, expression);
     }
 
     @NotNull
     public static JsExpression longFromNumber(@NotNull JsExpression expression) {
-        return invokeMethod(kotlinLongNameRef, Namer.LONG_FROM_NUMBER, expression);
+        return invokeMethod(Namer.KOTLIN_LONG_NAME_REF, Namer.LONG_FROM_NUMBER, expression);
     }
 
     @NotNull