From 87387d030f63de0d630a7b4fdc62cf0594e1b113 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 11 Jul 2016 21:57:46 +0300
Subject: [PATCH] Minor, fix yellow code in OverrideResolver and OverridingUtil

---
 .../jetbrains/kotlin/resolve/OverrideResolver.java  | 13 ++++++-------
 .../jetbrains/kotlin/resolve/OverridingUtil.java    |  5 +++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java
index 08db8cfac51..4686e7f9037 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java
@@ -56,8 +56,7 @@ import static org.jetbrains.kotlin.resolve.DescriptorUtils.classCanHaveAbstractM
 import static org.jetbrains.kotlin.resolve.OverridingUtil.OverrideCompatibilityInfo.Result.OVERRIDABLE;
 
 public class OverrideResolver {
-
-    @NotNull private final BindingTrace trace;
+    private final BindingTrace trace;
 
     public OverrideResolver(@NotNull BindingTrace trace) {
         this.trace = trace;
@@ -124,7 +123,7 @@ public class OverrideResolver {
         };
     }
 
-    private static enum Filtering {
+    private enum Filtering {
         RETAIN_OVERRIDING,
         RETAIN_OVERRIDDEN
     }
@@ -136,7 +135,7 @@ public class OverrideResolver {
     }
 
     @NotNull
-    public static <D> Set<D> filterOutOverriding(@NotNull Set<D> candidateSet) {
+    private static <D> Set<D> filterOutOverriding(@NotNull Set<D> candidateSet) {
         //noinspection unchecked
         return filterOverrides(candidateSet, Function.ID, Filtering.RETAIN_OVERRIDDEN);
     }
@@ -757,7 +756,7 @@ public class OverrideResolver {
 
     /**
      * @return overridden real descriptors (not fake overrides). Note that all usages of this method should be followed by calling
-     * {@link #filterOutOverridden(java.util.Set)} or {@link #filterOutOverriding(java.util.Set)}, because some of the declarations
+     * {@link #filterOutOverridden(Set)} or {@link #filterOutOverriding(Set)}, because some of the declarations
      * can override the other
      * TODO: merge this method with filterOutOverridden
      */
@@ -956,7 +955,7 @@ public class OverrideResolver {
         }
     }
 
-    public static boolean isReturnTypeOkForOverride(
+    private static boolean isReturnTypeOkForOverride(
             @NotNull CallableDescriptor superDescriptor,
             @NotNull CallableDescriptor subDescriptor
     ) {
@@ -992,7 +991,7 @@ public class OverrideResolver {
         return new IndexedParametersSubstitution(superTypeParameters, arguments).buildSubstitutor();
     }
 
-    public static boolean isPropertyTypeOkForOverride(
+    private static boolean isPropertyTypeOkForOverride(
             @NotNull PropertyDescriptor superDescriptor,
             @NotNull PropertyDescriptor subDescriptor
     ) {
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java
index 3700b4044a1..09ce9befb95 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java
@@ -239,7 +239,7 @@ public class OverridingUtil {
     }
 
     @Nullable
-    static OverrideCompatibilityInfo checkReceiverAndParameterCount(
+    private static OverrideCompatibilityInfo checkReceiverAndParameterCount(
             CallableDescriptor superDescriptor,
             CallableDescriptor subDescriptor
     ) {
@@ -290,7 +290,7 @@ public class OverridingUtil {
         return true;
     }
 
-    static List<KotlinType> compiledValueParameters(CallableDescriptor callableDescriptor) {
+    private static List<KotlinType> compiledValueParameters(CallableDescriptor callableDescriptor) {
         ReceiverParameterDescriptor receiverParameter = callableDescriptor.getExtensionReceiverParameter();
         List<KotlinType> parameters = new ArrayList<KotlinType>();
         if (receiverParameter != null) {
@@ -501,6 +501,7 @@ public class OverridingUtil {
 
         H firstNonFlexible = null;
         for (H candidate : candidates) {
+            //noinspection ConstantConditions
             if (!FlexibleTypesKt.isFlexible(descriptorByHandle.invoke(candidate).getReturnType())) {
                 firstNonFlexible = candidate;
                 break;