From 3a830a3499d6817996816336baf8e3d2bb515c66 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Wed, 17 Oct 2012 15:57:21 +0400 Subject: [PATCH] Minor refactoring: some annotations in JavaDescriptorResolver --- .../jet/lang/resolve/java/JavaDescriptorResolver.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java index 9a3064ceef7..7fa1cebfbb4 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java @@ -126,10 +126,12 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes return namespaceResolver.getJavaPackageScope(fqName, ns); } + @NotNull public Set resolveFieldGroupByName(Name name, ResolverScopeData data) { return propertiesResolver.resolveFieldGroupByName(name, data); } + @NotNull public Set resolveFieldGroup(ResolverScopeData data) { return propertiesResolver.resolveFieldGroup(data); } @@ -164,10 +166,12 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes return functionResolver.resolveFunctionGroup(methodName, scopeData); } + @NotNull public List resolveMethods(@NotNull ResolverScopeData scopeData) { return functionResolver.resolveMethods(scopeData); } + @NotNull public List resolveInnerClasses(DeclarationDescriptor owner, PsiClass psiClass, boolean staticMembers) { return innerClassResolver.resolveInnerClasses(owner, psiClass, staticMembers); }