diff --git a/stdlib/ktSrc/JavaLang.kt b/stdlib/ktSrc/JavaLang.kt index bbdbf76245a..66009d500cf 100644 --- a/stdlib/ktSrc/JavaLang.kt +++ b/stdlib/ktSrc/JavaLang.kt @@ -6,8 +6,9 @@ import java.lang.Object val T.javaClass : Class get() = jet.runtime.Intrinsics.getJavaClass(this) as Class +fun javaClass() : Class = (typeinfo() as org.jetbrains.jet.rt.TypeInfoImpl).getJavaClass().sure() + val TypeInfo.javaClassForType : Class get() { - println(this) return (this as org.jetbrains.jet.rt.TypeInfoImpl).getJavaClass().sure() } diff --git a/testlib/test/JavaClassTest.kt b/testlib/test/JavaClassTest.kt new file mode 100644 index 00000000000..1babadec901 --- /dev/null +++ b/testlib/test/JavaClassTest.kt @@ -0,0 +1,12 @@ +package testjc + +import stdhack.test.* + +class C() + +class JavaClassTest() : TestSupport() { + fun testMe () { + assertEquals("java.util.ArrayList", javaClass>().getName()) + assertEquals("testjc.C", javaClass().getName()) + } +} \ No newline at end of file