diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.java index 17af13ce3dd..81bc6a6bb6d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.java @@ -47,7 +47,7 @@ public class WriteThroughScope extends WritableScopeWithImports { @Override @NotNull - public Collection getDeclarationsByLabel(LabelName labelName) { + public Collection getDeclarationsByLabel(@NotNull LabelName labelName) { checkMayRead(); return writableWorker.getDeclarationsByLabel(labelName); diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java index 991076daa59..d8eee2edca4 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java @@ -37,7 +37,7 @@ public abstract class JavaClassMembersScope extends JavaBaseScope { @NotNull @Override - public Collection getDeclarationsByLabel(LabelName labelName) { + public Collection getDeclarationsByLabel(@NotNull LabelName labelName) { throw new UnsupportedOperationException(); // TODO } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java index d6d8448585a..70b6fa454b4 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java @@ -74,7 +74,7 @@ public abstract class AbstractScopeAdapter implements JetScope { @NotNull @Override - public Collection getDeclarationsByLabel(LabelName labelName) { + public Collection getDeclarationsByLabel(@NotNull LabelName labelName) { return getWorkerScope().getDeclarationsByLabel(labelName); } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.java index 90ac6d9c532..9ca0810b3b9 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.java @@ -54,7 +54,7 @@ public class InnerClassesScopeWrapper extends AbstractScopeAdapter { @NotNull @Override - public Collection getDeclarationsByLabel(LabelName labelName) { + public Collection getDeclarationsByLabel(@NotNull LabelName labelName) { return Collections2.filter(actualScope.getDeclarationsByLabel(labelName), IS_CLASS); } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java index 2e4d883e616..ed9512ff3ea 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java @@ -59,7 +59,7 @@ public abstract class JetScopeImpl implements JetScope { @NotNull @Override - public Collection getDeclarationsByLabel(LabelName labelName) { + public Collection getDeclarationsByLabel(@NotNull LabelName labelName) { return Collections.emptyList(); }