From dc713cda2c212c005c03e70fe1090288cb65818e Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 30 Jun 2016 20:51:07 +0300 Subject: [PATCH] Rename: BuiltinOverridabilityCondition -> JavaIncompatibilityRulesOverridabilityConditionBuiltinOverridabilityCondition --- ...org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition | 2 +- ...on.kt => JavaIncompatibilityRulesOverridabilityCondition.kt} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/{BuiltinOverridabilityCondition.kt => JavaIncompatibilityRulesOverridabilityCondition.kt} (97%) diff --git a/core/descriptor.loader.java/src/META-INF/services/org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition b/core/descriptor.loader.java/src/META-INF/services/org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition index af683875f4a..640fe97ea60 100644 --- a/core/descriptor.loader.java/src/META-INF/services/org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition +++ b/core/descriptor.loader.java/src/META-INF/services/org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition @@ -1,3 +1,3 @@ org.jetbrains.kotlin.load.java.FieldOverridabilityCondition org.jetbrains.kotlin.load.java.ErasedOverridabilityCondition -org.jetbrains.kotlin.load.java.BuiltinOverridabilityCondition \ No newline at end of file +org.jetbrains.kotlin.load.java.JavaIncompatibilityRulesOverridabilityCondition diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/BuiltinOverridabilityCondition.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaIncompatibilityRulesOverridabilityCondition.kt similarity index 97% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/BuiltinOverridabilityCondition.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaIncompatibilityRulesOverridabilityCondition.kt index 0baf63507e0..b6b2ae5ecd9 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/BuiltinOverridabilityCondition.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaIncompatibilityRulesOverridabilityCondition.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition.Result import org.jetbrains.kotlin.resolve.OverridingUtil import org.jetbrains.kotlin.resolve.descriptorUtil.isDocumentedAnnotation -class BuiltinOverridabilityCondition : ExternalOverridabilityCondition { +class JavaIncompatibilityRulesOverridabilityCondition : ExternalOverridabilityCondition { override fun isOverridable(superDescriptor: CallableDescriptor, subDescriptor: CallableDescriptor, subClassDescriptor: ClassDescriptor?): Result { if (superDescriptor !is CallableMemberDescriptor || subDescriptor !is FunctionDescriptor || subDescriptor.isFromBuiltins()) { return Result.UNKNOWN