From 35f5e8a075847e5c38fea02e7c05b7076688f10a Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <Pavel.Talanov@jetbrains.com>
Date: Wed, 4 Jul 2012 12:01:12 +0400
Subject: [PATCH] Extract and move method from StaticContext to Namer

---
 .../org/jetbrains/k2js/translate/context/Namer.java | 13 +++++++++++++
 .../k2js/translate/context/StaticContext.java       |  9 +--------
 2 files changed, 14 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 871ddbadedd..a011f020b4b 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
@@ -19,6 +19,9 @@ package org.jetbrains.k2js.translate.context;
 import com.google.dart.compiler.backend.js.ast.*;
 import com.google.dart.compiler.util.AstUtil;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
+import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
+import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 
 import static org.jetbrains.k2js.translate.utils.JsAstUtils.setQualifier;
 
@@ -208,4 +211,14 @@ public final class Namer {
         /*package*/ JsScope getKotlinScope() {
         return kotlinScope;
     }
+
+    @NotNull
+    static String generateNamespaceName(DeclarationDescriptor descriptor) {
+        if (DescriptorUtils.isRootNamespace((NamespaceDescriptor) descriptor)) {
+            return getRootNamespaceName();
+        }
+        else {
+            return descriptor.getName().getName();
+        }
+    }
 }
diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java b/js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java
index d933bbb2ba0..ee732580478 100644
--- a/js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java
+++ b/js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java
@@ -189,14 +189,7 @@ public final class StaticContext {
                         return null;
                     }
 
-                    String name;
-                    if (DescriptorUtils.isRootNamespace((NamespaceDescriptor) descriptor)) {
-                        name = Namer.getRootNamespaceName();
-                    }
-                    else {
-                        name = descriptor.getName().getName();
-                    }
-
+                    String name = Namer.generateNamespaceName(descriptor);
                     return getRootScope().declareUnobfuscatableName(name);
                 }
             };