From f11095b1d06a1a7025d3c9eb9d502fb6b9b8b314 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Tue, 24 Jun 2014 20:02:55 +0400
Subject: [PATCH] Minor. DelegatingFlexibleType moved to top level

---
 .../resolve/java/lazy/types/LazyJavaTypeResolver.kt  | 10 ----------
 .../org/jetbrains/jet/lang/types/flexibleTypes.kt    | 12 +++++++++++-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt
index aa419eb2616..a09a904ac95 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt
@@ -260,16 +260,6 @@ class LazyJavaTypeResolver(
         override fun isNullable(): Boolean = _nullable()
     }
 
-    private open class DelegatingFlexibleType(
-            override val lowerBound: JetType,
-            override val upperBound: JetType
-    ) : DelegatingType(), FlexibleType {
-
-        override fun getDelegate() = lowerBound
-
-        override fun toString() = "('$lowerBound'..'$upperBound')"
-    }
-
     /*
      * For a java type like java.util.List<Foo>
      *     lowerBound = MutableList<Foo>
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/flexibleTypes.kt b/core/descriptors/src/org/jetbrains/jet/lang/types/flexibleTypes.kt
index 239c74f6ce6..8775ae629d0 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/types/flexibleTypes.kt
+++ b/core/descriptors/src/org/jetbrains/jet/lang/types/flexibleTypes.kt
@@ -19,4 +19,14 @@ package org.jetbrains.jet.lang.types
 public trait FlexibleType : JetType {
     val lowerBound: JetType
     val upperBound: JetType
-}
\ No newline at end of file
+}
+
+public open class DelegatingFlexibleType(
+        override val lowerBound: JetType,
+        override val upperBound: JetType
+) : DelegatingType(), FlexibleType {
+
+    override fun getDelegate() = lowerBound
+
+    override fun toString() = "('$lowerBound'..'$upperBound')"
+}