diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AbstractScopeAdapter.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AbstractScopeAdapter.java index 7078bb0ee12..7719335c113 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AbstractScopeAdapter.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AbstractScopeAdapter.java @@ -108,9 +108,4 @@ public abstract class AbstractScopeAdapter implements JetScope { public Collection getAllDescriptors(@NotNull DescriptorPredicate predicate) { return getWorkerScope().getAllDescriptors(predicate); } - - @Override - public Collection getAllDescriptors() { - return getAllDescriptors(DescriptorPredicate.all()); - } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java index e4c68cb68fe..d1a4be70d71 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java @@ -231,11 +231,6 @@ public abstract class AbstractLazyMemberScope getAllDescriptors() { - return getAllDescriptors(DescriptorPredicate.all()); - } - protected abstract void addExtraDescriptors(); @Override diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java index ed67b75dfe1..83ac6c1f081 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java @@ -166,9 +166,4 @@ public class ChainedScope implements JetScope { } return allDescriptors; } - - @Override - public Collection getAllDescriptors() { - return getAllDescriptors(DescriptorPredicate.all()); - } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java index 1607af7575f..60e88d7498f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java @@ -86,8 +86,6 @@ public interface JetScope { @NotNull Collection getAllDescriptors(@NotNull DescriptorPredicate predicate); - Collection getAllDescriptors(); - /** * @return EFFECTIVE implicit receiver at this point (may be corresponding to an outer scope) */ diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java index 8cca81cb214..3cdae6cc32d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java @@ -92,11 +92,6 @@ public abstract class JetScopeImpl implements JetScope { return Collections.emptyList(); } - @Override - public Collection getAllDescriptors() { - return getAllDescriptors(DescriptorPredicate.all()); - } - @Override public void getImplicitReceiversHierarchy(@NotNull List result) { } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java index bb7ab7294eb..4e6467dc0fc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java @@ -162,9 +162,4 @@ public class SubstitutingScope implements JetScope { } return allDescriptors; } - - @Override - public Collection getAllDescriptors() { - return getAllDescriptors(DescriptorPredicate.all()); - } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/ErrorUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/ErrorUtils.java index 5e6a2e3598a..e143718cb33 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/ErrorUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/ErrorUtils.java @@ -117,10 +117,6 @@ public class ErrorUtils { return Collections.emptyList(); } - @Override - public Collection getAllDescriptors() { - return getAllDescriptors(DescriptorPredicate.all()); - } } private static final ClassDescriptorImpl ERROR_CLASS = new ClassDescriptorImpl(ERROR_MODULE, Collections.emptyList(), Name.special("")) {