From e6776ebd8e1f3c2220e62f24eba5e1d8d59fe92b Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 21 Jul 2015 14:46:48 +0200
Subject: [PATCH] code cleanup: container module

---
 .../src/org/jetbrains/kotlin/container/Container.kt          | 4 +---
 .../src/org/jetbrains/kotlin/container/Singletons.kt         | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/compiler/container/src/org/jetbrains/kotlin/container/Container.kt b/compiler/container/src/org/jetbrains/kotlin/container/Container.kt
index d7e265ef3b4..3cc96b7a6c4 100644
--- a/compiler/container/src/org/jetbrains/kotlin/container/Container.kt
+++ b/compiler/container/src/org/jetbrains/kotlin/container/Container.kt
@@ -18,11 +18,9 @@ package org.jetbrains.kotlin.container
 
 import java.io.Closeable
 import java.io.PrintStream
-import java.io.Writer
 import java.lang.reflect.ParameterizedType
 import java.lang.reflect.Type
 import java.lang.reflect.WildcardType
-import kotlin.properties.Delegates
 
 class ContainerConsistencyException(message: String) : Exception(message)
 
@@ -36,7 +34,7 @@ object DynamicComponentDescriptor : ValueDescriptor {
 }
 
 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)
 
     override fun createResolveContext(requestingDescriptor: ValueDescriptor): ValueResolveContext {
diff --git a/compiler/container/src/org/jetbrains/kotlin/container/Singletons.kt b/compiler/container/src/org/jetbrains/kotlin/container/Singletons.kt
index 4e25fe61d1c..106ba17277e 100644
--- a/compiler/container/src/org/jetbrains/kotlin/container/Singletons.kt
+++ b/compiler/container/src/org/jetbrains/kotlin/container/Singletons.kt
@@ -17,9 +17,8 @@
 package org.jetbrains.kotlin.container
 
 import java.io.Closeable
+import java.lang.reflect.Type
 import java.util.ArrayList
-import kotlin.properties.Delegates
-import java.lang.reflect.*
 
 enum class ComponentState {
     Null,
@@ -33,7 +32,7 @@ enum class ComponentState {
 public abstract class SingletonDescriptor(val container: ComponentContainer) : ComponentDescriptor, Closeable {
     private var instance: Any? = 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 {
         when {