added @NotNull annotations

This commit is contained in:
Svetlana Isakova
2013-03-06 17:22:30 +04:00
parent 4d4fd5885d
commit d5b5fe8503
6 changed files with 23 additions and 22 deletions
@@ -32,7 +32,7 @@ public class BasicCallResolutionContext extends CallResolutionContext<BasicCallR
@NotNull JetType expectedType, @NotNull JetType expectedType,
@NotNull DataFlowInfo dataFlowInfo, @NotNull DataFlowInfo dataFlowInfo,
@NotNull ResolveMode resolveMode, @NotNull ResolveMode resolveMode,
ExpressionPosition expressionPosition @NotNull ExpressionPosition expressionPosition
) { ) {
return new BasicCallResolutionContext(trace, scope, call, expectedType, dataFlowInfo, resolveMode, expressionPosition); return new BasicCallResolutionContext(trace, scope, call, expectedType, dataFlowInfo, resolveMode, expressionPosition);
} }
@@ -54,7 +54,7 @@ public class BasicCallResolutionContext extends CallResolutionContext<BasicCallR
@NotNull JetScope scope, @NotNull JetScope scope,
@NotNull DataFlowInfo dataFlowInfo, @NotNull DataFlowInfo dataFlowInfo,
@NotNull JetType expectedType, @NotNull JetType expectedType,
ExpressionPosition expressionPosition @NotNull ExpressionPosition expressionPosition
) { ) {
return create(trace, scope, call, expectedType, dataFlowInfo, resolveMode, expressionPosition); return create(trace, scope, call, expectedType, dataFlowInfo, resolveMode, expressionPosition);
} }
@@ -42,7 +42,7 @@ public final class CallCandidateResolutionContext<D extends CallableDescriptor>
@NotNull JetType expectedType, @NotNull JetType expectedType,
@NotNull DataFlowInfo dataFlowInfo, @NotNull DataFlowInfo dataFlowInfo,
@NotNull ResolveMode resolveMode, @NotNull ResolveMode resolveMode,
ExpressionPosition expressionPosition @NotNull ExpressionPosition expressionPosition
) { ) {
super(trace, scope, call, expectedType, dataFlowInfo, resolveMode, expressionPosition); super(trace, scope, call, expectedType, dataFlowInfo, resolveMode, expressionPosition);
this.candidateCall = candidateCall; this.candidateCall = candidateCall;
@@ -83,7 +83,7 @@ public final class CallCandidateResolutionContext<D extends CallableDescriptor>
@NotNull JetScope scope, @NotNull JetScope scope,
@NotNull DataFlowInfo dataFlowInfo, @NotNull DataFlowInfo dataFlowInfo,
@NotNull JetType expectedType, @NotNull JetType expectedType,
ExpressionPosition expressionPosition @NotNull ExpressionPosition expressionPosition
) { ) {
return new CallCandidateResolutionContext<D>( return new CallCandidateResolutionContext<D>(
candidateCall, tracing, trace, scope, call, expectedType, dataFlowInfo, resolveMode, expressionPosition); candidateCall, tracing, trace, scope, call, expectedType, dataFlowInfo, resolveMode, expressionPosition);
@@ -16,6 +16,7 @@
package org.jetbrains.jet.lang.resolve.calls.context; package org.jetbrains.jet.lang.resolve.calls.context;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.Call; import org.jetbrains.jet.lang.psi.Call;
import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.BindingTrace;
import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo;
@@ -27,13 +28,13 @@ public abstract class CallResolutionContext<Context extends CallResolutionContex
public final ResolveMode resolveMode; public final ResolveMode resolveMode;
protected CallResolutionContext( protected CallResolutionContext(
BindingTrace trace, @NotNull BindingTrace trace,
JetScope scope, @NotNull JetScope scope,
Call call, @NotNull Call call,
JetType expectedType, @NotNull JetType expectedType,
DataFlowInfo dataFlowInfo, @NotNull DataFlowInfo dataFlowInfo,
ResolveMode resolveMode, @NotNull ResolveMode resolveMode,
ExpressionPosition expressionPosition @NotNull ExpressionPosition expressionPosition
) { ) {
super(trace, scope, expectedType, dataFlowInfo, expressionPosition); super(trace, scope, expectedType, dataFlowInfo, expressionPosition);
this.call = call; this.call = call;
@@ -32,11 +32,11 @@ public abstract class ResolutionContext<Context extends ResolutionContext> {
public final ExpressionPosition expressionPosition; public final ExpressionPosition expressionPosition;
protected ResolutionContext( protected ResolutionContext(
BindingTrace trace, @NotNull BindingTrace trace,
JetScope scope, @NotNull JetScope scope,
JetType expectedType, @NotNull JetType expectedType,
DataFlowInfo dataFlowInfo, @NotNull DataFlowInfo dataFlowInfo,
ExpressionPosition expressionPosition @NotNull ExpressionPosition expressionPosition
) { ) {
this.trace = trace; this.trace = trace;
this.scope = scope; this.scope = scope;
@@ -50,7 +50,7 @@ public abstract class ResolutionContext<Context extends ResolutionContext> {
@NotNull JetScope scope, @NotNull JetScope scope,
@NotNull DataFlowInfo dataFlowInfo, @NotNull DataFlowInfo dataFlowInfo,
@NotNull JetType expectedType, @NotNull JetType expectedType,
ExpressionPosition expressionPosition @NotNull ExpressionPosition expressionPosition
); );
protected abstract Context self(); protected abstract Context self();
@@ -84,7 +84,7 @@ public class ResolutionTask<D extends CallableDescriptor, F extends D> extends C
@NotNull JetScope scope, @NotNull JetScope scope,
@NotNull DataFlowInfo dataFlowInfo, @NotNull DataFlowInfo dataFlowInfo,
@NotNull JetType expectedType, @NotNull JetType expectedType,
ExpressionPosition expressionPosition @NotNull ExpressionPosition expressionPosition
) { ) {
ResolutionTask<D, F> newTask = new ResolutionTask<D, F>(candidates, reference, tracing, trace, scope, call, expectedType, dataFlowInfo, resolveMode, expressionPosition); ResolutionTask<D, F> newTask = new ResolutionTask<D, F>(candidates, reference, tracing, trace, scope, call, expectedType, dataFlowInfo, resolveMode, expressionPosition);
newTask.setCheckingStrategy(checkingStrategy); newTask.setCheckingStrategy(checkingStrategy);
@@ -41,7 +41,7 @@ public class ExpressionTypingContext extends ResolutionContext<ExpressionTypingC
@NotNull JetScope scope, @NotNull JetScope scope,
@NotNull DataFlowInfo dataFlowInfo, @NotNull DataFlowInfo dataFlowInfo,
@NotNull JetType expectedType, @NotNull JetType expectedType,
ExpressionPosition expressionPosition) { @NotNull ExpressionPosition expressionPosition) {
return newContext(expressionTypingServices, new LabelResolver(), trace, scope, dataFlowInfo, expectedType, expressionPosition); return newContext(expressionTypingServices, new LabelResolver(), trace, scope, dataFlowInfo, expectedType, expressionPosition);
} }
@@ -53,7 +53,7 @@ public class ExpressionTypingContext extends ResolutionContext<ExpressionTypingC
@NotNull JetScope scope, @NotNull JetScope scope,
@NotNull DataFlowInfo dataFlowInfo, @NotNull DataFlowInfo dataFlowInfo,
@NotNull JetType expectedType, @NotNull JetType expectedType,
ExpressionPosition expressionPosition) { @NotNull ExpressionPosition expressionPosition) {
return new ExpressionTypingContext(expressionTypingServices, return new ExpressionTypingContext(expressionTypingServices,
labelResolver, trace, scope, dataFlowInfo, expectedType, expressionPosition); labelResolver, trace, scope, dataFlowInfo, expectedType, expressionPosition);
} }
@@ -71,7 +71,7 @@ public class ExpressionTypingContext extends ResolutionContext<ExpressionTypingC
@NotNull JetScope scope, @NotNull JetScope scope,
@NotNull DataFlowInfo dataFlowInfo, @NotNull DataFlowInfo dataFlowInfo,
@NotNull JetType expectedType, @NotNull JetType expectedType,
ExpressionPosition expressionPosition) { @NotNull ExpressionPosition expressionPosition) {
super(trace, scope, expectedType, dataFlowInfo, expressionPosition); super(trace, scope, expectedType, dataFlowInfo, expressionPosition);
this.expressionTypingServices = expressionTypingServices; this.expressionTypingServices = expressionTypingServices;
this.labelResolver = labelResolver; this.labelResolver = labelResolver;
@@ -83,7 +83,7 @@ public class ExpressionTypingContext extends ResolutionContext<ExpressionTypingC
@NotNull JetScope scope, @NotNull JetScope scope,
@NotNull DataFlowInfo dataFlowInfo, @NotNull DataFlowInfo dataFlowInfo,
@NotNull JetType expectedType, @NotNull JetType expectedType,
ExpressionPosition expressionPosition @NotNull ExpressionPosition expressionPosition
) { ) {
return new ExpressionTypingContext(expressionTypingServices, labelResolver, trace, scope, dataFlowInfo, expectedType, expressionPosition); return new ExpressionTypingContext(expressionTypingServices, labelResolver, trace, scope, dataFlowInfo, expectedType, expressionPosition);
} }