Revert "frontend: optimize DescriptorPredicate.asNamePredicate"

This reverts commit 554a54bcc5.

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 new NamePredicate() {
-            return NamePredicate.all();
+            @Override
-        }
+            public boolean matches(@NotNull Name name) {
-        else {
+                return includeName(name);
-            return new NamePredicate() {
+            }
-                @Override
+        };
-                public boolean matches(@NotNull Name name) {
-                    return includeName(name);
-                }
-            };
-        }
     }
 
 }