From 28ab9eebbce3c9d43643e03395c93e87a00d2d7e Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Fri, 22 Jan 2016 02:10:57 +0300
Subject: [PATCH] minor: manual cleanup

---
 core/runtime.jvm/src/kotlin/jvm/JvmClassMapping.kt | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/runtime.jvm/src/kotlin/jvm/JvmClassMapping.kt b/core/runtime.jvm/src/kotlin/jvm/JvmClassMapping.kt
index 4883be911da..bceabadebdd 100644
--- a/core/runtime.jvm/src/kotlin/jvm/JvmClassMapping.kt
+++ b/core/runtime.jvm/src/kotlin/jvm/JvmClassMapping.kt
@@ -84,16 +84,20 @@ val <T : Any> Class<T>.kotlin: KClass<T>
  * Returns the runtime Java class of this object.
  */
 val <T: Any> T.javaClass : Class<T>
-    get() = (this as java.lang.Object).`class` as Class<T>
+    @Suppress("UsePropertyAccessSyntax")
+    get() = (this as java.lang.Object).getClass() as Class<T>
 
-@Deprecated("Use 'java' property to get Java class corresponding to this Kotlin class or cast this instance to Any if you really want to get the runtime Java class of this implementation of KClass.", ReplaceWith("(this as Any).javaClass"), level = DeprecationLevel.ERROR) val <T: Any> KClass<T>.javaClass: Class<KClass<T>>
+@Deprecated("Use 'java' property to get Java class corresponding to this Kotlin class or cast this instance to Any if you really want to get the runtime Java class of this implementation of KClass.", ReplaceWith("(this as Any).javaClass"), level = DeprecationLevel.ERROR)
+val <T: Any> KClass<T>.javaClass: Class<KClass<T>>
     @JvmName("getRuntimeClassOfKClassInstance")
-    get() = (this as java.lang.Object).`class` as Class<KClass<T>>
+    @Suppress("UsePropertyAccessSyntax")
+    get() = (this as java.lang.Object).getClass() as Class<KClass<T>>
 
 /**
  * Checks if array can contain element of type [T].
  */
-@Suppress("REIFIED_TYPE_PARAMETER_NO_INLINE") fun <reified T : Any> Array<*>.isArrayOf(): Boolean =
+@Suppress("REIFIED_TYPE_PARAMETER_NO_INLINE")
+fun <reified T : Any> Array<*>.isArrayOf(): Boolean =
         T::class.java.isAssignableFrom(this.javaClass.componentType)
 
 /**