From f218bd1df2a71736de76dffb1ce701e4c834f244 Mon Sep 17 00:00:00 2001
From: Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com>
Date: Fri, 1 Nov 2013 17:28:05 +0400
Subject: [PATCH] Add NotNull annotations

---
 .../org/jetbrains/jet/lang/cfg/pseudocode/PseudocodeUtil.java   | 1 +
 .../src/org/jetbrains/jet/lang/resolve/BindingTrace.java        | 1 +
 .../src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java | 1 +
 .../org/jetbrains/jet/lang/resolve/ObservableBindingTrace.java  | 1 +
 .../frontend/src/org/jetbrains/jet/lang/resolve/TraceUtil.java  | 1 +
 .../lazy/storage/LockBasedLazyResolveStorageManager.java        | 1 +
 compiler/tests/org/jetbrains/jet/JetTestUtils.java              | 2 ++
 7 files changed, 8 insertions(+)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/PseudocodeUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/PseudocodeUtil.java
index c2ec825e3dc..15005aa924b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/PseudocodeUtil.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/PseudocodeUtil.java
@@ -35,6 +35,7 @@ public class PseudocodeUtil {
 
     public static Pseudocode generatePseudocode(@NotNull JetDeclaration declaration, @NotNull final BindingContext bindingContext) {
         BindingTrace mockTrace = new BindingTrace() {
+            @NotNull
             @Override
             public BindingContext getBindingContext() {
                 return bindingContext;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTrace.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTrace.java
index 81922382ed2..b02b262592a 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTrace.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTrace.java
@@ -26,6 +26,7 @@ import java.util.Collection;
 
 public interface BindingTrace extends DiagnosticHolder {
 
+    @NotNull
     BindingContext getBindingContext();
     
     <K, V> void record(WritableSlice<K, V> slice, K key, V value);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java
index 92a85601509..093fd35ce24 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java
@@ -88,6 +88,7 @@ public class BindingTraceContext implements BindingTrace {
         diagnosticList.clear();
     }
 
+    @NotNull
     @Override
     public BindingContext getBindingContext() {
         return bindingContext;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ObservableBindingTrace.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ObservableBindingTrace.java
index 02bc8d88799..87b9c060a40 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ObservableBindingTrace.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ObservableBindingTrace.java
@@ -43,6 +43,7 @@ public class ObservableBindingTrace implements BindingTrace {
         originalTrace.report(diagnostic);
     }
 
+    @NotNull
     @Override
     public BindingContext getBindingContext() {
         return originalTrace.getBindingContext();
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceUtil.java
index 097bce4303a..32c9eef786d 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceUtil.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceUtil.java
@@ -28,6 +28,7 @@ import java.util.Collection;
 public class TraceUtil {
     public final static BindingTrace TRACE_STUB = new BindingTrace() {
 
+        @NotNull
         @Override
         public BindingContext getBindingContext() {
             return BINDING_CONTEXT_STUB;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/storage/LockBasedLazyResolveStorageManager.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/storage/LockBasedLazyResolveStorageManager.java
index 7b479217833..3152c330503 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/storage/LockBasedLazyResolveStorageManager.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/storage/LockBasedLazyResolveStorageManager.java
@@ -131,6 +131,7 @@ public class LockBasedLazyResolveStorageManager extends LockBasedStorageManager
             this.context = new LockProtectedContext(lock, trace.getBindingContext());
         }
 
+        @NotNull
         @Override
         public BindingContext getBindingContext() {
             return context;
diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java
index fbbeab8ed02..2786b544eae 100644
--- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java
+++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java
@@ -100,6 +100,7 @@ public class JetTestUtils {
     public static final BindingTrace DUMMY_TRACE = new BindingTrace() {
 
 
+        @NotNull
         @Override
         public BindingContext getBindingContext() {
             return new BindingContext() {
@@ -160,6 +161,7 @@ public class JetTestUtils {
     };
 
     public static BindingTrace DUMMY_EXCEPTION_ON_ERROR_TRACE = new BindingTrace() {
+        @NotNull
         @Override
         public BindingContext getBindingContext() {
             return new BindingContext() {