azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added @NotNull annotations

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/BasicCallResolutionContext.java
+2 -2
View File
@@ -32,7 +32,7 @@ public class BasicCallResolutionContext extends CallResolutionContext<BasicCallR
@NotNull JetType expectedType,
@NotNull DataFlowInfo dataFlowInfo,
@NotNull ResolveMode resolveMode,
ExpressionPosition expressionPosition
@NotNull ExpressionPosition 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 DataFlowInfo dataFlowInfo,
@NotNull JetType expectedType,
ExpressionPosition expressionPosition
@NotNull ExpressionPosition expressionPosition
) {
return create(trace, scope, call, expectedType, dataFlowInfo, resolveMode, expressionPosition);
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallCandidateResolutionContext.java
+2 -2
View File
@@ -42,7 +42,7 @@ public final class CallCandidateResolutionContext<D extends CallableDescriptor>
@NotNull JetType expectedType,
@NotNull DataFlowInfo dataFlowInfo,
@NotNull ResolveMode resolveMode,
ExpressionPosition expressionPosition
@NotNull ExpressionPosition expressionPosition
) {
super(trace, scope, call, expectedType, dataFlowInfo, resolveMode, expressionPosition);
this.candidateCall = candidateCall;
@@ -83,7 +83,7 @@ public final class CallCandidateResolutionContext<D extends CallableDescriptor>
@NotNull JetScope scope,
@NotNull DataFlowInfo dataFlowInfo,
@NotNull JetType expectedType,
ExpressionPosition expressionPosition
@NotNull ExpressionPosition expressionPosition
) {
return new CallCandidateResolutionContext<D>(
candidateCall, tracing, trace, scope, call, expectedType, dataFlowInfo, resolveMode, expressionPosition);
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallResolutionContext.java
+8 -7
View File
@@ -16,6 +16,7 @@
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.resolve.BindingTrace;
import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo;
@@ -27,13 +28,13 @@ public abstract class CallResolutionContext<Context extends CallResolutionContex
public final ResolveMode resolveMode;
protected CallResolutionContext(
BindingTrace trace,
JetScope scope,
Call call,
JetType expectedType,
DataFlowInfo dataFlowInfo,
ResolveMode resolveMode,
ExpressionPosition expressionPosition
@NotNull BindingTrace trace,
@NotNull JetScope scope,
@NotNull Call call,
@NotNull JetType expectedType,
@NotNull DataFlowInfo dataFlowInfo,
@NotNull ResolveMode resolveMode,
@NotNull ExpressionPosition expressionPosition
) {
super(trace, scope, expectedType, dataFlowInfo, expressionPosition);
this.call = call;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionContext.java
+6 -6
View File
@@ -32,11 +32,11 @@ public abstract class ResolutionContext<Context extends ResolutionContext> {
public final ExpressionPosition expressionPosition;
protected ResolutionContext(
BindingTrace trace,
JetScope scope,
JetType expectedType,
DataFlowInfo dataFlowInfo,
ExpressionPosition expressionPosition
@NotNull BindingTrace trace,
@NotNull JetScope scope,
@NotNull JetType expectedType,
@NotNull DataFlowInfo dataFlowInfo,
@NotNull ExpressionPosition expressionPosition
) {
this.trace = trace;
this.scope = scope;
@@ -50,7 +50,7 @@ public abstract class ResolutionContext<Context extends ResolutionContext> {
@NotNull JetScope scope,
@NotNull DataFlowInfo dataFlowInfo,
@NotNull JetType expectedType,
ExpressionPosition expressionPosition
@NotNull ExpressionPosition expressionPosition
);
protected abstract Context self();
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTask.java
+1 -1
View File
@@ -84,7 +84,7 @@ public class ResolutionTask<D extends CallableDescriptor, F extends D> extends C
@NotNull JetScope scope,
@NotNull DataFlowInfo dataFlowInfo,
@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);
newTask.setCheckingStrategy(checkingStrategy);
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingContext.java
+4 -4
View File
@@ -41,7 +41,7 @@ public class ExpressionTypingContext extends ResolutionContext<ExpressionTypingC
@NotNull JetScope scope,
@NotNull DataFlowInfo dataFlowInfo,
@NotNull JetType expectedType,
ExpressionPosition expressionPosition) {
@NotNull ExpressionPosition 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 DataFlowInfo dataFlowInfo,
@NotNull JetType expectedType,
ExpressionPosition expressionPosition) {
@NotNull ExpressionPosition expressionPosition) {
return new ExpressionTypingContext(expressionTypingServices,
labelResolver, trace, scope, dataFlowInfo, expectedType, expressionPosition);
}
@@ -71,7 +71,7 @@ public class ExpressionTypingContext extends ResolutionContext<ExpressionTypingC
@NotNull JetScope scope,
@NotNull DataFlowInfo dataFlowInfo,
@NotNull JetType expectedType,
ExpressionPosition expressionPosition) {
@NotNull ExpressionPosition expressionPosition) {
super(trace, scope, expectedType, dataFlowInfo, expressionPosition);
this.expressionTypingServices = expressionTypingServices;
this.labelResolver = labelResolver;
@@ -83,7 +83,7 @@ public class ExpressionTypingContext extends ResolutionContext<ExpressionTypingC
@NotNull JetScope scope,
@NotNull DataFlowInfo dataFlowInfo,
@NotNull JetType expectedType,
ExpressionPosition expressionPosition
@NotNull ExpressionPosition expressionPosition
) {
return new ExpressionTypingContext(expressionTypingServices, labelResolver, trace, scope, dataFlowInfo, expectedType, expressionPosition);
}