From 5468af848e8c18f65a28da03c88f087cae1c9298 Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Fri, 8 Jun 2012 03:38:42 +0400
Subject: [PATCH] kill JvmClassName from Class constructor

compiler itself and compiler data should not be mixed
---
 .../src/org/jetbrains/jet/lang/resolve/java/JdkNames.java     | 4 ++--
 .../src/org/jetbrains/jet/lang/resolve/java/JvmClassName.java | 4 ----
 .../org/jetbrains/jet/lang/resolve/java/JvmStdlibNames.java   | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JdkNames.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JdkNames.java
index 5d7fd2e93a7..759a6bad9dc 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JdkNames.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JdkNames.java
@@ -21,7 +21,7 @@ package org.jetbrains.jet.lang.resolve.java;
  */
 public class JdkNames {
 
-    public static final JvmClassName JL_OBJECT = new JvmClassName(Object.class);
-    public static final JvmClassName JL_STRING = new JvmClassName(String.class);
+    public static final JvmClassName JL_OBJECT = JvmClassName.byInternalName("java/lang/Object");
+    public static final JvmClassName JL_STRING = JvmClassName.byInternalName("java/lang/String");
 
 }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmClassName.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmClassName.java
index f03df0e1def..bdef4564b8b 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmClassName.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmClassName.java
@@ -28,10 +28,6 @@ public class JvmClassName {
     @NotNull
     private final FqName fqName;
 
-    public JvmClassName(@NotNull Class<?> klass) {
-        this(klass.getName());
-    }
-
     public JvmClassName(@NotNull String fqName) {
         this(new FqName(fqName));
     }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmStdlibNames.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmStdlibNames.java
index 9f7cd105317..51239cb6b19 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmStdlibNames.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmStdlibNames.java
@@ -69,7 +69,7 @@ public class JvmStdlibNames {
 
     public static final JvmClassName ASSERT_INVISIBLE_IN_RESOLVER = new JvmClassName("org.jetbrains.jet.rt.annotation.AssertInvisibleInResolver");
 
-    public static final JvmClassName KOTLIN_SIGNATURE = new JvmClassName(KotlinSignature.class.getName());
+    public static final JvmClassName KOTLIN_SIGNATURE = new JvmClassName("jet.runtime.typeinfo.KotlinSignature");
     public static final String KOTLIN_SIGNATURE_VALUE_METHOD = "value";
 
     private JvmStdlibNames() {