From 3f89598f146d054614c8cba9c3639fbbeec1b2b4 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 6 Sep 2013 14:25:44 +0400 Subject: [PATCH] Minor. Made method @NotNull. --- .../src/org/jetbrains/jet/lang/resolve/BindingContext.java | 2 ++ .../src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java | 1 + .../org/jetbrains/jet/lang/resolve/DelegatingBindingTrace.java | 1 + .../frontend/src/org/jetbrains/jet/lang/resolve/TraceUtil.java | 1 + .../jet/lang/resolve/lazy/storage/LockBasedStorageManager.java | 1 + compiler/tests/org/jetbrains/jet/JetTestUtils.java | 2 ++ 6 files changed, 8 insertions(+) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java index c4fbd953666..4b3291d98e2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java @@ -44,6 +44,7 @@ import static org.jetbrains.jet.util.slicedmap.RewritePolicy.DO_NOTHING; public interface BindingContext { BindingContext EMPTY = new BindingContext() { + @NotNull @Override public Collection getDiagnostics() { return Collections.emptyList(); @@ -263,6 +264,7 @@ public interface BindingContext { @Deprecated // This field is needed only for the side effects of its initializer Void _static_initializer = BasicWritableSlice.initSliceDebugNames(BindingContext.class); + @NotNull Collection getDiagnostics(); @Nullable 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 2d8af172dbb..1640cb06eb0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java @@ -37,6 +37,7 @@ public class BindingTraceContext implements BindingTrace { private final BindingContext bindingContext = new BindingContext() { + @NotNull @Override public Collection getDiagnostics() { return diagnostics; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatingBindingTrace.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatingBindingTrace.java index 9a015f60763..18976171b45 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatingBindingTrace.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatingBindingTrace.java @@ -38,6 +38,7 @@ public class DelegatingBindingTrace implements BindingTrace { private final String name; private final BindingContext bindingContext = new BindingContext() { + @NotNull @Override public Collection getDiagnostics() { ArrayList mergedDiagnostics = new ArrayList(diagnostics); 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 f83f5df34c3..0ee826ab1ad 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceUtil.java @@ -62,6 +62,7 @@ public class TraceUtil { }; public final static BindingContext BINDING_CONTEXT_STUB = new BindingContext() { + @NotNull @Override public Collection getDiagnostics() { throw new IllegalStateException(); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/storage/LockBasedStorageManager.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/storage/LockBasedStorageManager.java index 28f641d2a9e..df402ffadca 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/storage/LockBasedStorageManager.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/storage/LockBasedStorageManager.java @@ -238,6 +238,7 @@ public class LockBasedStorageManager implements StorageManager { this.context = context; } + @NotNull @Override public Collection getDiagnostics() { synchronized (lock) { diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java index 309b346c4f4..8dea3381a87 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java @@ -103,6 +103,7 @@ public class JetTestUtils { public BindingContext getBindingContext() { return new BindingContext() { + @NotNull @Override public Collection getDiagnostics() { throw new UnsupportedOperationException(); // TODO @@ -161,6 +162,7 @@ public class JetTestUtils { @Override public BindingContext getBindingContext() { return new BindingContext() { + @NotNull @Override public Collection getDiagnostics() { throw new UnsupportedOperationException();