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); }