From adafd70730731c82b65a278b8051f387d51a1fe9 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Fri, 31 Oct 2014 15:03:02 +0300
Subject: [PATCH] Abstract lazy type moved to descriptors

---
 .../lazy/descriptors/LazyJavaAnnotationDescriptor.kt     | 3 +--
 .../lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt | 2 +-
 .../org/jetbrains/jet/lang/types/AbstractLazyType.kt}    | 9 ++++-----
 3 files changed, 6 insertions(+), 8 deletions(-)
 rename core/{descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaType.kt => descriptors/src/org/jetbrains/jet/lang/types/AbstractLazyType.kt} (89%)

diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt
index 703fde4c2ee..53a9ccb8e77 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt
@@ -29,7 +29,6 @@ import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.*
 import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames
 import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils
 import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage
-import org.jetbrains.jet.lang.resolve.java.lazy.types.LazyJavaType
 import org.jetbrains.jet.utils.valuesToMap
 import org.jetbrains.jet.utils.keysToMapExceptNulls
 import org.jetbrains.jet.lang.resolve.java.lazy.types.toAttributes
@@ -164,7 +163,7 @@ class LazyJavaAnnotationDescriptor(
 
         val arguments = listOf(TypeProjectionImpl(type))
 
-        val javaClassObjectType = object : LazyJavaType(c.storageManager) {
+        val javaClassObjectType = object : AbstractLazyType(c.storageManager) {
             override fun computeTypeConstructor() = jlClass.getTypeConstructor()
             override fun computeArguments() = arguments
             override fun computeMemberScope() = jlClass.getMemberScope(arguments)
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 6e829ddc166..1108466025d 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
@@ -104,7 +104,7 @@ class LazyJavaTypeResolver(
     private inner class LazyJavaClassifierType(
             private val javaType: JavaClassifierType,
             private val attr: JavaTypeAttributes
-    ) : LazyJavaType(c.storageManager) {
+    ) : AbstractLazyType(c.storageManager) {
 
         private val classifier = c.storageManager.createNullableLazyValue { javaType.getClassifier() }
 
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaType.kt b/core/descriptors/src/org/jetbrains/jet/lang/types/AbstractLazyType.kt
similarity index 89%
rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaType.kt
rename to core/descriptors/src/org/jetbrains/jet/lang/types/AbstractLazyType.kt
index f8a0b9a7fb7..620666ce556 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaType.kt
+++ b/core/descriptors/src/org/jetbrains/jet/lang/types/AbstractLazyType.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.resolve.java.lazy.types
+package org.jetbrains.jet.lang.types
 
 import org.jetbrains.jet.storage.StorageManager
-import org.jetbrains.jet.lang.types.*
 import org.jetbrains.jet.lang.resolve.scopes.JetScope
 import org.jetbrains.jet.lang.descriptors.annotations.Annotations
 
-abstract class LazyJavaType(storageManager: StorageManager) : AbstractJetType(), LazyType {
+public abstract class AbstractLazyType(storageManager: StorageManager) : AbstractJetType(), LazyType {
 
     private val _typeConstructor = storageManager.createLazyValue {computeTypeConstructor()}
     override fun getConstructor(): TypeConstructor = _typeConstructor()
@@ -53,4 +52,4 @@ abstract class LazyJavaType(storageManager: StorageManager) : AbstractJetType(),
         }
         return super<AbstractJetType>.toString()
     }
-}
+}
\ No newline at end of file