diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/DescriptorPredicate.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/DescriptorPredicate.java index 1cea38fe111..8a6ff5c1a29 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/DescriptorPredicate.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/DescriptorPredicate.java @@ -37,10 +37,6 @@ public abstract class DescriptorPredicate { public abstract boolean includeName(@NotNull Name name); - public boolean includeAnyName() { - return includeAll(); - } - public enum DescriptorKind { CLASS, CALLABLE_MEMBER, @@ -179,11 +175,6 @@ public abstract class DescriptorPredicate { return true; } - @Override - public boolean includeAnyName() { - return true; - } - @Override public boolean includeExtension(boolean extension) { return true; @@ -228,11 +219,6 @@ public abstract class DescriptorPredicate { public boolean includeName(@NotNull Name name) { return required.matches(name); } - - @Override - public boolean includeAnyName() { - return false; - } } public static DescriptorPredicate callableMembers(@NotNull NamePredicate required) { @@ -307,17 +293,12 @@ public abstract class DescriptorPredicate { } public NamePredicate asNamePredicate() { - if (includeAnyName()) { - return NamePredicate.all(); - } - else { - return new NamePredicate() { - @Override - public boolean matches(@NotNull Name name) { - return includeName(name); - } - }; - } + return new NamePredicate() { + @Override + public boolean matches(@NotNull Name name) { + return includeName(name); + } + }; } }