azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make project compilable after fixes about generic nullability

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/container/src/org/jetbrains/kotlin/container/Container.kt
+2 -2
View File
@@ -111,10 +111,10 @@ public fun StorageComponentContainer.registerInstance(instance: Any): StorageCom
return registerDescriptors(listOf(InstanceComponentDescriptor(instance)))
}
public inline fun <reified T> StorageComponentContainer.resolve(context: ValueResolveContext = unknownContext): ValueDescriptor? {
public inline fun <reified T : Any> StorageComponentContainer.resolve(context: ValueResolveContext = unknownContext): ValueDescriptor? {
return resolve(javaClass<T>(), context)
}
public inline fun <reified T> StorageComponentContainer.resolveMultiple(context: ValueResolveContext = unknownContext): Iterable<ValueDescriptor> {
public inline fun <reified T : Any> StorageComponentContainer.resolveMultiple(context: ValueResolveContext = unknownContext): Iterable<ValueDescriptor> {
return resolveMultiple(javaClass<T>(), context)
}
compiler/container/src/org/jetbrains/kotlin/container/Dsl.kt
+4 -4
View File
@@ -23,16 +23,16 @@ public fun createContainer(id: String, init: StorageComponentContainer.() -> Uni
return c
}
public inline fun <reified T> StorageComponentContainer.useImpl() {
public inline fun <reified T : Any> StorageComponentContainer.useImpl() {
registerSingleton(javaClass<T>())
}
public inline fun <reified T> ComponentProvider.get(): T {
public inline fun <reified T : Any> ComponentProvider.get(): T {
return getService(javaClass<T>())
}
@suppress("UNCHECKED_CAST")
public fun <T> ComponentProvider.getService(request: Class<T>): T {
public fun <T : Any> ComponentProvider.getService(request: Class<T>): T {
return resolve(request)!!.getValue() as T
}
@@ -40,6 +40,6 @@ public fun StorageComponentContainer.useInstance(instance: Any) {
registerInstance(instance)
}
public inline fun <reified T> ComponentProvider.get(thisRef: Any?, desc: PropertyMetadata): T {
public inline fun <reified T : Any> ComponentProvider.get(thisRef: Any?, desc: PropertyMetadata): T {
return getService(javaClass<T>())
}