From 82feef23c384f8985c804421c953f60b10722e0a Mon Sep 17 00:00:00 2001
From: Pavel Talanov <talanov.pavel@gmail.com>
Date: Sat, 12 Oct 2013 20:46:20 +0400
Subject: [PATCH] Rename: OverridingUtil#filterOverrides -> filterOutOverridden
 to be more precise

---
 .../jet/codegen/ImplementationBodyCodegen.java        |  2 +-
 .../jet/lang/resolve/BindingContextUtils.java         |  2 +-
 .../jetbrains/jet/lang/resolve/OverrideResolver.java  |  8 +++++---
 .../calls/results/ResolutionResultsHandler.java       |  4 ++--
 .../jetbrains/jet/lang/resolve/OverridingUtil.java    | 11 ++++++++---
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
index 9bbdefd3f9a..bb3f2606555 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
@@ -1833,7 +1833,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
                     OverridingUtil.getOverriddenDeclarations(callableMemberDescriptor);
 
             Collection<CallableMemberDescriptor> filteredOverriddenDeclarations =
-                    OverridingUtil.filterOverrides(Sets.newLinkedHashSet(overriddenDeclarations));
+                    OverridingUtil.filterOutOverridden(Sets.newLinkedHashSet(overriddenDeclarations));
 
             int count = 0;
             CallableMemberDescriptor candidate = null;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java
index 233fc4122a1..448c22e447b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java
@@ -355,6 +355,6 @@ public class BindingContextUtils {
                 throw new AssertionError("Unexpected callable kind " + kind);
             }
         }
-        return OverridingUtil.filterOverrides(result);
+        return OverridingUtil.filterOutOverridden(result);
     }
 }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
index 9ed9bd945c7..d2f06e1ff4b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
@@ -288,7 +288,8 @@ public class OverrideResolver {
         Map<CallableMemberDescriptor, Set<CallableMemberDescriptor>> overriddenDeclarationsByDirectParent = collectOverriddenDeclarations(directOverridden);
 
         List<CallableMemberDescriptor> allOverriddenDeclarations = ContainerUtil.flatten(overriddenDeclarationsByDirectParent.values());
-        Set<CallableMemberDescriptor> allFilteredOverriddenDeclarations = OverridingUtil.filterOverrides(Sets.newLinkedHashSet(allOverriddenDeclarations));
+        Set<CallableMemberDescriptor> allFilteredOverriddenDeclarations = OverridingUtil.filterOutOverridden(
+                Sets.newLinkedHashSet(allOverriddenDeclarations));
 
         Set<CallableMemberDescriptor> relevantDirectlyOverridden =
                 getRelevantDirectlyOverridden(overriddenDeclarationsByDirectParent, allFilteredOverriddenDeclarations);
@@ -394,7 +395,8 @@ public class OverrideResolver {
         Map<CallableMemberDescriptor, Set<CallableMemberDescriptor>> overriddenDeclarationsByDirectParent = Maps.newLinkedHashMap();
         for (CallableMemberDescriptor descriptor : directOverriddenDescriptors) {
             Collection<CallableMemberDescriptor> overriddenDeclarations = OverridingUtil.getOverriddenDeclarations(descriptor);
-            Set<CallableMemberDescriptor> filteredOverrides = OverridingUtil.filterOverrides(Sets.newLinkedHashSet(overriddenDeclarations));
+            Set<CallableMemberDescriptor> filteredOverrides = OverridingUtil.filterOutOverridden(
+                    Sets.newLinkedHashSet(overriddenDeclarations));
             Set<CallableMemberDescriptor> overridden = Sets.newLinkedHashSet();
             for (CallableMemberDescriptor memberDescriptor : filteredOverrides) {
                 overridden.add(memberDescriptor);
@@ -416,7 +418,7 @@ public class OverrideResolver {
         }
 
         // Only those actually inherited
-        Set<CallableMemberDescriptor> filteredMembers = OverridingUtil.filterOverrides(inheritedFunctions);
+        Set<CallableMemberDescriptor> filteredMembers = OverridingUtil.filterOutOverridden(inheritedFunctions);
 
         // Group members with "the same" signature
         Multimap<CallableMemberDescriptor, CallableMemberDescriptor> factoredMembers = CommonSuppliers.newLinkedHashSetHashSetMultimap();
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/ResolutionResultsHandler.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/ResolutionResultsHandler.java
index fc6e393edac..f7798fe2acc 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/ResolutionResultsHandler.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/ResolutionResultsHandler.java
@@ -142,7 +142,7 @@ public class ResolutionResultsHandler {
 
             assert false : "Should not be reachable, cause every status must belong to some level";
 
-            Set<ResolvedCallWithTrace<D>> noOverrides = OverridingUtil.filterOverrides(failedCandidates, MAP_TO_CANDIDATE);
+            Set<ResolvedCallWithTrace<D>> noOverrides = OverridingUtil.filterOutOverridden(failedCandidates, MAP_TO_CANDIDATE);
             if (noOverrides.size() != 1) {
                 tracing.noneApplicable(trace, noOverrides);
                 tracing.recordAmbiguity(trace, noOverrides);
@@ -203,7 +203,7 @@ public class ResolutionResultsHandler {
             }
         }
 
-        Set<ResolvedCallWithTrace<D>> noOverrides = OverridingUtil.filterOverrides(candidates, MAP_TO_RESULT);
+        Set<ResolvedCallWithTrace<D>> noOverrides = OverridingUtil.filterOutOverridden(candidates, MAP_TO_RESULT);
         if (noOverrides.size() == 1) {
                 return OverloadResolutionResultsImpl.success(noOverrides.iterator().next());
         }
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java
index e75dab6e7d3..aaf2efd2904 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java
@@ -46,11 +46,16 @@ public class OverridingUtil {
     private OverridingUtil() {
     }
 
-    public static <D extends CallableDescriptor> Set<D> filterOverrides(Set<D> candidateSet) {
-        return filterOverrides(candidateSet, Function.ID);
+    @NotNull
+    public static <D extends CallableDescriptor> Set<D> filterOutOverridden(@NotNull Set<D> candidateSet) {
+        return filterOutOverridden(candidateSet, Function.ID);
     }
 
-    public static <D> Set<D> filterOverrides(Set<D> candidateSet, Function<? super D, ? extends CallableDescriptor> transform) {
+    @NotNull
+    public static <D> Set<D> filterOutOverridden(
+            @NotNull Set<D> candidateSet,
+            @NotNull Function<? super D, ? extends CallableDescriptor> transform
+    ) {
         Set<D> candidates = Sets.newLinkedHashSet();
         outerLoop:
         for (D meD : candidateSet) {