From efe550ee8f8fbee04f7dcafcaf24a5a75b5e76a1 Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Mon, 18 Jun 2012 20:49:37 +0400
Subject: [PATCH] Revert "add JetScope.getAllDescriptors for KDoc"

This reverts commit 5e2521046c9ab1da47e482099a16053d22be6043.
---
 .../org/jetbrains/jet/lang/resolve/AbstractScopeAdapter.java | 5 -----
 .../jet/lang/resolve/lazy/AbstractLazyMemberScope.java       | 5 -----
 .../org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java  | 5 -----
 .../src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java  | 2 --
 .../org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java  | 5 -----
 .../jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java | 5 -----
 .../src/org/jetbrains/jet/lang/types/ErrorUtils.java         | 4 ----
 7 files changed, 31 deletions(-)

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<DeclarationDescriptor> getAllDescriptors(@NotNull DescriptorPredicate predicate) {
         return getWorkerScope().getAllDescriptors(predicate);
     }
-
-    @Override
-    public Collection<DeclarationDescriptor> 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<D extends DeclarationDescriptor, D
         return DescriptorPredicateUtils.filter(allDescriptors, predicate);
     }
 
-    @Override
-    public Collection<DeclarationDescriptor> 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<DeclarationDescriptor> 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<DeclarationDescriptor> getAllDescriptors(@NotNull DescriptorPredicate predicate);
 
-    Collection<DeclarationDescriptor> 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<DeclarationDescriptor> getAllDescriptors() {
-        return getAllDescriptors(DescriptorPredicate.all());
-    }
-
     @Override
     public void getImplicitReceiversHierarchy(@NotNull List<ReceiverDescriptor> 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<DeclarationDescriptor> 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<DeclarationDescriptor> getAllDescriptors() {
-            return getAllDescriptors(DescriptorPredicate.all());
-        }
     }
 
     private static final ClassDescriptorImpl ERROR_CLASS = new ClassDescriptorImpl(ERROR_MODULE, Collections.<AnnotationDescriptor>emptyList(), Name.special("<ERROR CLASS>")) {