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

code cleanup: container module

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-07-21 14:46:48 +02:00
parent 7c2b2dcc6a
commit e6776ebd8e
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/container/src/org/jetbrains/kotlin/container/Container.kt
+1 -3
View File
@@ -18,11 +18,9 @@ package org.jetbrains.kotlin.container
import java.io.Closeable import java.io.Closeable
import java.io.PrintStream import java.io.PrintStream
import java.io.Writer
import java.lang.reflect.ParameterizedType import java.lang.reflect.ParameterizedType
import java.lang.reflect.Type import java.lang.reflect.Type
import java.lang.reflect.WildcardType import java.lang.reflect.WildcardType
import kotlin.properties.Delegates
class ContainerConsistencyException(message: String) : Exception(message) class ContainerConsistencyException(message: String) : Exception(message)
@@ -36,7 +34,7 @@ object DynamicComponentDescriptor : ValueDescriptor {
} }
public class StorageComponentContainer(id: String) : ComponentContainer, Closeable { public class StorageComponentContainer(id: String) : ComponentContainer, Closeable {
public val unknownContext: ComponentResolveContext by Delegates.lazy { ComponentResolveContext(this, DynamicComponentDescriptor) } public val unknownContext: ComponentResolveContext by lazy { ComponentResolveContext(this, DynamicComponentDescriptor) }
val componentStorage = ComponentStorage(id) val componentStorage = ComponentStorage(id)
override fun createResolveContext(requestingDescriptor: ValueDescriptor): ValueResolveContext { override fun createResolveContext(requestingDescriptor: ValueDescriptor): ValueResolveContext {
compiler/container/src/org/jetbrains/kotlin/container/Singletons.kt
+2 -3
View File
@@ -17,9 +17,8 @@
package org.jetbrains.kotlin.container package org.jetbrains.kotlin.container
import java.io.Closeable import java.io.Closeable
import java.lang.reflect.Type
import java.util.ArrayList import java.util.ArrayList
import kotlin.properties.Delegates
import java.lang.reflect.*
enum class ComponentState { enum class ComponentState {
Null, Null,
@@ -33,7 +32,7 @@ enum class ComponentState {
public abstract class SingletonDescriptor(val container: ComponentContainer) : ComponentDescriptor, Closeable { public abstract class SingletonDescriptor(val container: ComponentContainer) : ComponentDescriptor, Closeable {
private var instance: Any? = null private var instance: Any? = null
protected var state: ComponentState = ComponentState.Null protected var state: ComponentState = ComponentState.Null
private val disposableObjects by Delegates.lazy { ArrayList<Closeable>() } private val disposableObjects by lazy { ArrayList<Closeable>() }
public override fun getValue(): Any { public override fun getValue(): Any {
when { when {