From d5b5fe850357e3c4400387fce409516ac43ef3b4 Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Wed, 6 Mar 2013 17:22:30 +0400
Subject: [PATCH] added @NotNull annotations

---
 .../calls/context/BasicCallResolutionContext.java |  4 ++--
 .../context/CallCandidateResolutionContext.java   |  4 ++--
 .../calls/context/CallResolutionContext.java      | 15 ++++++++-------
 .../resolve/calls/context/ResolutionContext.java  | 12 ++++++------
 .../lang/resolve/calls/tasks/ResolutionTask.java  |  2 +-
 .../expressions/ExpressionTypingContext.java      |  8 ++++----
 6 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/BasicCallResolutionContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/BasicCallResolutionContext.java
index fb6498907b1..ada7c4f187b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/BasicCallResolutionContext.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/BasicCallResolutionContext.java
@@ -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);
     }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallCandidateResolutionContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallCandidateResolutionContext.java
index 92d13f3f0e0..42b0d3a672a 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallCandidateResolutionContext.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallCandidateResolutionContext.java
@@ -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);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallResolutionContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallResolutionContext.java
index 17617ab01e3..16129204031 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallResolutionContext.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallResolutionContext.java
@@ -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;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionContext.java
index 33c96208fcd..17cefefaa70 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionContext.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionContext.java
@@ -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();
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTask.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTask.java
index 1be0298a2f8..6ad80878633 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTask.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTask.java
@@ -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);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingContext.java
index 98f75c0bd8f..388dd08d214 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingContext.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingContext.java
@@ -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);
     }