From 871f57ff69140afc3eb65d9255057f94702a5394 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 1 Aug 2012 15:29:37 +0400 Subject: [PATCH] Infer Nullability refactoring --- .../src/org/jetbrains/jet/lang/descriptors/Visibilities.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/Visibilities.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/Visibilities.java index 00b9173c48b..dabf828e242 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/Visibilities.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/Visibilities.java @@ -21,7 +21,6 @@ import com.google.common.collect.Sets; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.OverridingUtil; import java.util.Map; import java.util.Set; @@ -111,7 +110,7 @@ public class Visibilities { private Visibilities() { } - public static boolean isVisible(DeclarationDescriptorWithVisibility what, DeclarationDescriptor from) { + public static boolean isVisible(@Nullable DeclarationDescriptorWithVisibility what, @NotNull DeclarationDescriptor from) { DeclarationDescriptorWithVisibility parent = what; while (parent != null) { if (parent.getVisibility() == LOCAL) { @@ -135,6 +134,7 @@ public class Visibilities { } /*package*/ + @Nullable static Integer compareLocal(@NotNull Visibility first, @NotNull Visibility second) { if (first == second) return 0; Integer firstIndex = ORDERED_VISIBILITIES.get(first);