From 36ada06bdb1a76c6de809509689089bd1380aec7 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Sun, 7 Sep 2014 15:21:07 +0400 Subject: [PATCH] Remove SuppressWarning('NullableProblems') and change @NotNull annotation to @Nullable in DescriptorPredicate.apply method --- .../functions/factories/PrimitiveUnaryOperationFIF.java | 3 ++- .../intrinsic/functions/patterns/DescriptorPredicate.java | 4 ++-- .../intrinsic/functions/patterns/PatternBuilder.java | 8 ++++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.java index 2341a129540..f7fa9655503 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.java @@ -53,7 +53,8 @@ public enum PrimitiveUnaryOperationFIF implements FunctionIntrinsicFactory { @NotNull private static final DescriptorPredicate NO_PARAMETERS = new DescriptorPredicate() { @Override - public boolean apply(@NotNull FunctionDescriptor descriptor) { + public boolean apply(@Nullable FunctionDescriptor descriptor) { + assert descriptor != null : "argument for DescriptorPredicate.apply should not be null"; return !JsDescriptorUtils.hasParameters(descriptor); } }; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/DescriptorPredicate.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/DescriptorPredicate.java index 3e275a330d5..ab5024655c7 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/DescriptorPredicate.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/DescriptorPredicate.java @@ -17,10 +17,10 @@ package org.jetbrains.k2js.translate.intrinsic.functions.patterns; import com.google.common.base.Predicate; -import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; public interface DescriptorPredicate extends Predicate { @Override - boolean apply(@SuppressWarnings("NullableProblems") @NotNull FunctionDescriptor descriptor); + boolean apply(@Nullable FunctionDescriptor descriptor); } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java index e675d68a496..5dfcc821542 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java @@ -18,6 +18,7 @@ package org.jetbrains.k2js.translate.intrinsic.functions.patterns; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.OverrideResolver; @@ -84,7 +85,8 @@ public final class PatternBuilder { return new DescriptorPredicate() { @Override - public boolean apply(@NotNull FunctionDescriptor descriptor) { + public boolean apply(@Nullable FunctionDescriptor descriptor) { + assert descriptor != null : "argument for DescriptorPredicate.apply should not be null, checkers=" + checkersWithPrefixChecker; //TODO: no need to wrap if we check beforehand try { return doApply(descriptor); @@ -167,7 +169,9 @@ public final class PatternBuilder { } @Override - public boolean apply(@NotNull FunctionDescriptor functionDescriptor) { + public boolean apply(@Nullable FunctionDescriptor functionDescriptor) { + assert functionDescriptor != null : + "argument for DescriptorPredicate.apply should not be null, receiverFqName=" + receiverFqName + " names=" + Arrays.asList(names); ReceiverParameterDescriptor actualReceiver = functionDescriptor.getReceiverParameter(); if (actualReceiver != null) { if (receiverFqName == null) return false;