Remove old 'get' delegate convention in interfaces

This commit is contained in:
Yan Zhulanow
2015-10-12 01:31:00 +03:00
parent 6d2f9cc669
commit bc3d1ddda0
20 changed files with 11 additions and 74 deletions
@@ -24,7 +24,6 @@ import org.jetbrains.kotlin.load.java.structure.JavaPackage
import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinarySourceElement
import org.jetbrains.kotlin.load.kotlin.PackageClassUtils
import org.jetbrains.kotlin.storage.getValue
import org.jetbrains.kotlin.storage.get
class LazyJavaPackageFragment(
private val c: LazyJavaResolverContext,
@@ -43,7 +43,6 @@ public class ReflectionTypes(private val module: ModuleDescriptor) {
}
private object ClassLookup {
fun get(types: ReflectionTypes, property: PropertyMetadata) = getValue(types, property)
fun getValue(types: ReflectionTypes, property: PropertyMetadata): ClassDescriptor {
return types.find(property.name.capitalize())
}
@@ -27,7 +27,6 @@ import org.jetbrains.kotlin.resolve.scopes.JetScope
import org.jetbrains.kotlin.resolve.scopes.LazyScopeAdapter
import org.jetbrains.kotlin.storage.StorageManager
import org.jetbrains.kotlin.storage.getValue
import org.jetbrains.kotlin.storage.get
import org.jetbrains.kotlin.types.TypeSubstitutor
public class LazyPackageViewDescriptorImpl(
@@ -40,7 +40,7 @@ internal class DescriptorRendererOptionsImpl : DescriptorRendererOptions {
if (field.getModifiers().and(Modifier.STATIC) != 0) continue
field.setAccessible(true)
val property = field.get(this) as? ObservableProperty<*> ?: continue
val value = property.get(this, PropertyMetadataImpl("")/* not used*/)
val value = property.getValue(this, PropertyMetadataImpl("")/* not used*/)
field.set(copy, copy.property(value as Any))
}
@@ -25,7 +25,6 @@ import org.jetbrains.kotlin.serialization.SerializedResourcePaths
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope
import org.jetbrains.kotlin.storage.StorageManager
import org.jetbrains.kotlin.storage.getValue
import org.jetbrains.kotlin.storage.get
import java.io.InputStream
import javax.inject.Inject
import kotlin.properties.Delegates
@@ -30,7 +30,6 @@ import org.jetbrains.kotlin.serialization.ProtoBuf
import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents
import org.jetbrains.kotlin.serialization.deserialization.NameResolver
import org.jetbrains.kotlin.storage.getValue
import org.jetbrains.kotlin.storage.get
import org.jetbrains.kotlin.utils.addIfNotNull
public open class DeserializedPackageMemberScope(
@@ -32,10 +32,6 @@ public interface NullableLazyValue<T : Any> : Function0<T?> {
public fun isComputed(): Boolean
}
public fun <T : Any> NotNullLazyValue<T>.get(_this: Any?, p: PropertyMetadata): T = invoke()
public fun <T : Any> NullableLazyValue<T>.get(_this: Any?, p: PropertyMetadata): T? = invoke()
public fun <T : Any> NotNullLazyValue<T>.getValue(_this: Any?, p: PropertyMetadata): T = invoke()
public fun <T : Any> NullableLazyValue<T>.getValue(_this: Any?, p: PropertyMetadata): T? = invoke()