From a395b8b4dda714bf3d5213d8668a7c3f91af38e1 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 18 Aug 2015 21:58:10 +0300 Subject: [PATCH] Minor: drop deprecated JetScope::getProperties which no longer have usages --- .../src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt | 4 +--- .../src/org/jetbrains/kotlin/types/ErrorUtils.java | 6 ------ 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt index 5db4cbb4ec5..ce1b8f0c2fa 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt @@ -50,9 +50,7 @@ public interface JetScope { // Temporary overloads which will be dropped when all usages will be processed @deprecated("Provide `location` explicitly", replaceWith = ReplaceWith("getClassifier(name, NoLookupLocation.UNSORTED)")) public final fun getClassifier(name: Name): ClassifierDescriptor? = getClassifier(name, NoLookupLocation.UNSORTED) - @deprecated("Provide `location` explicitly", replaceWith = ReplaceWith("getClassifier(name, NoLookupLocation.UNSORTED)")) - public final fun getProperties(name: Name): Collection = getProperties(name, NoLookupLocation.UNSORTED) - @deprecated("Provide `location` explicitly", replaceWith = ReplaceWith("getClassifier(name, NoLookupLocation.UNSORTED)")) + @deprecated("Provide `location` explicitly", replaceWith = ReplaceWith("getFunctions(name, NoLookupLocation.UNSORTED)")) public final fun getFunctions(name: Name): Collection = getFunctions(name, NoLookupLocation.UNSORTED) /** diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java index 77119f93c38..10085d3983f 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java @@ -81,12 +81,6 @@ public class ErrorUtils { return getClassifier(name, NoLookupLocation.UNSORTED); } - @NotNull - @Override - public Collection getProperties(@NotNull Name name) { - return getProperties(name, NoLookupLocation.UNSORTED); - } - @NotNull @Override public Collection getFunctions(@NotNull Name name) {