Make project compilable after fixes about generic nullability

This commit is contained in:
Denis Zharkov
2015-08-07 14:24:56 +03:00
parent 5e09a0c2c9
commit 4a3fbcc16e
24 changed files with 52 additions and 52 deletions
@@ -43,7 +43,7 @@ public val KClass<*>.declaredFunctions: Collection<KFunction<*>>
/**
* Returns non-extension properties declared in this class and all of its superclasses.
*/
public val <T> KClass<T>.memberProperties: Collection<KProperty1<T, *>>
public val <T : Any> KClass<T>.memberProperties: Collection<KProperty1<T, *>>
get() = (this as KClassImpl<T>)
.getMembers(declaredOnly = false, nonExtensions = true, extensions = false)
.filterIsInstance<KProperty1<T, *>>()
@@ -52,7 +52,7 @@ public val <T> KClass<T>.memberProperties: Collection<KProperty1<T, *>>
/**
* Returns extension properties declared in this class and all of its superclasses.
*/
public val <T> KClass<T>.memberExtensionProperties: Collection<KProperty2<T, *, *>>
public val <T : Any> KClass<T>.memberExtensionProperties: Collection<KProperty2<T, *, *>>
get() = (this as KClassImpl<T>)
.getMembers(declaredOnly = false, nonExtensions = false, extensions = true)
.filterIsInstance<KProperty2<T, *, *>>()
@@ -61,7 +61,7 @@ public val <T> KClass<T>.memberExtensionProperties: Collection<KProperty2<T, *,
/**
* Returns non-extension properties declared in this class.
*/
public val <T> KClass<T>.declaredMemberProperties: Collection<KProperty1<T, *>>
public val <T : Any> KClass<T>.declaredMemberProperties: Collection<KProperty1<T, *>>
get() = (this as KClassImpl<T>)
.getMembers(declaredOnly = true, nonExtensions = true, extensions = false)
.filterIsInstance<KProperty1<T, *>>()
@@ -70,7 +70,7 @@ public val <T> KClass<T>.declaredMemberProperties: Collection<KProperty1<T, *>>
/**
* Returns extension properties declared in this class.
*/
public val <T> KClass<T>.declaredMemberExtensionProperties: Collection<KProperty2<T, *, *>>
public val <T : Any> KClass<T>.declaredMemberExtensionProperties: Collection<KProperty2<T, *, *>>
get() = (this as KClassImpl<T>)
.getMembers(declaredOnly = true, nonExtensions = false, extensions = true)
.filterIsInstance<KProperty2<T, *, *>>()
@@ -25,19 +25,19 @@ public val Field.kotlin: KProperty<*>?
@deprecated("Use memberProperties instead.", ReplaceWith("memberProperties"))
public val <T> KClass<T>.properties: Collection<KProperty1<T, *>>
public val <T : Any> KClass<T>.properties: Collection<KProperty1<T, *>>
get() = memberProperties
@deprecated("Use extensionProperties instead.", ReplaceWith("extensionProperties"))
public val <T> KClass<T>.extensionProperties: Collection<KProperty2<T, *, *>>
public val <T : Any> KClass<T>.extensionProperties: Collection<KProperty2<T, *, *>>
get() = memberExtensionProperties
@deprecated("Use declaredMemberProperties instead.", ReplaceWith("declaredMemberProperties"))
public val <T> KClass<T>.declaredProperties: Collection<KProperty1<T, *>>
public val <T : Any> KClass<T>.declaredProperties: Collection<KProperty1<T, *>>
get() = declaredMemberProperties
@deprecated("Use declaredMemberExtensionProperties instead.", ReplaceWith("declaredMemberExtensionProperties"))
public val <T> KClass<T>.declaredExtensionProperties: Collection<KProperty2<T, *, *>>
public val <T : Any> KClass<T>.declaredExtensionProperties: Collection<KProperty2<T, *, *>>
get() = declaredMemberExtensionProperties
@@ -48,11 +48,11 @@ public var KProperty<*>.accessible: Boolean
@deprecated("Use .java instead.", ReplaceWith("java"))
public val <T> KClass<T>.__java: Class<T>
public val <T : Any> KClass<T>.__java: Class<T>
@jvmName("getJava")
get() = this.java
@deprecated("Use .kotlin instead.", ReplaceWith("kotlin"))
public val <T> Class<T>.__kotlin: KClass<T>
public val <T : Any> Class<T>.__kotlin: KClass<T>
@jvmName("getKotlin")
get() = this.kotlin
@@ -27,7 +27,7 @@ import kotlin.reflect.jvm.internal.pcollections.HashPMap
private var FOREIGN_K_CLASSES = HashPMap.empty<String, Any>()
// This function is invoked on each reflection access to Java classes, properties, etc. Performance is critical here.
fun <T> foreignKotlinClass(jClass: Class<T>): KClassImpl<T> {
fun <T : Any> foreignKotlinClass(jClass: Class<T>): KClassImpl<T> {
val name = jClass.getName()
val cached = FOREIGN_K_CLASSES[name]
if (cached is WeakReference<*>) {
@@ -131,7 +131,7 @@ public val Method.kotlinFunction: KFunction<*>?
* or `null` if this constructor cannot be represented by a Kotlin function
* (for example, if it is a synthetic constructor).
*/
public val <T> Constructor<T>.kotlinFunction: KFunction<T>?
public val <T : Any> Constructor<T>.kotlinFunction: KFunction<T>?
get() {
if (isSynthetic()) return null