From f7be8ce9534b651ef0037164e587eb22f97c2500 Mon Sep 17 00:00:00 2001 From: svtk Date: Wed, 30 Oct 2013 20:56:35 +0400 Subject: [PATCH] refactoring: warnings eliminated --- .../jetbrains/jet/lang/resolve/calls/CallResolver.java | 1 + .../jet/lang/resolve/calls/CandidateResolver.java | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java index 1a1f0c3098c..3931cade022 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java @@ -63,6 +63,7 @@ import static org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionRes import static org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue.NO_RECEIVER; import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE; +@SuppressWarnings("RedundantTypeArguments") public class CallResolver { @NotNull private ExpressionTypingServices expressionTypingServices; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java index e42ae267aaa..f0c413bf328 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java @@ -430,7 +430,7 @@ public class CandidateResolver { }, null); } - private boolean isFairSafeCallExpression(@NotNull JetExpression expression, @NotNull BindingTrace trace) { + private static boolean isFairSafeCallExpression(@NotNull JetExpression expression, @NotNull BindingTrace trace) { // We are interested in type of the last call: // 'a.b?.foo()' is safe call, but 'a?.b.foo()' is not. // Since receiver is 'a.b' and selector is 'foo()', @@ -443,7 +443,7 @@ public class CandidateResolver { return type != null && type.isNullable(); } - private void checkResultArgumentType( + private static void checkResultArgumentType( @Nullable JetType type, @NotNull ValueArgument argument, @NotNull CallCandidateResolutionContext context @@ -669,15 +669,14 @@ public class CandidateResolver { ValueArgumentsCheckingResult checkingResult = checkValueArgumentTypes( context, context.candidateCall, trace, resolveFunctionArgumentBodies); ResolutionStatus resultStatus = checkingResult.status; - resultStatus = resultStatus.combine(checkReceiver(context, trace, false)); + resultStatus = resultStatus.combine(checkReceiver(context, trace)); return new ValueArgumentsCheckingResult(resultStatus, checkingResult.argumentTypes); } private static ResolutionStatus checkReceiver( @NotNull CallCandidateResolutionContext context, - @NotNull BindingTrace trace, - boolean checkOnlyReceiverTypeError + @NotNull BindingTrace trace ) { ResolutionStatus resultStatus = SUCCESS; ResolvedCall candidateCall = context.candidateCall;