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 732a2057908..9eaeed8c4e5 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 @@ -907,8 +907,7 @@ public class JavaDescriptorResolver { (NamespaceDescriptorParent) resolveParentDescriptor(psiPackage), Collections.emptyList(), // TODO name == null ? JAVA_ROOT : name, - fqName, - true + fqName ); trace.record(BindingContext.NAMESPACE, psiPackage, namespaceDescriptor); @@ -997,8 +996,7 @@ public class JavaDescriptorResolver { resolveNamespace(fqName.parent(), DescriptorSearchRule.INCLUDE_KOTLIN), Collections.emptyList(), // TODO psiClass.getName(), - fqName, - false + fqName ); ResolverNamespaceData scopeData = createNamespaceResolverScopeData(fqName, ns); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaNamespaceDescriptor.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaNamespaceDescriptor.java index 19db2430f59..f13982f0923 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaNamespaceDescriptor.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaNamespaceDescriptor.java @@ -32,14 +32,11 @@ import java.util.List; public class JavaNamespaceDescriptor extends AbstractNamespaceDescriptorImpl { private JetScope memberScope; private final FqName qualifiedName; - /** Namespace of class with static methods */ - private final boolean namespace; - + public JavaNamespaceDescriptor(NamespaceDescriptorParent containingDeclaration, List annotations, - @NotNull String name, @NotNull FqName qualifiedName, boolean namespace) { + @NotNull String name, @NotNull FqName qualifiedName) { super(containingDeclaration, annotations, name); this.qualifiedName = qualifiedName; - this.namespace = namespace; } public void setMemberScope(@NotNull JetScope memberScope) { @@ -55,8 +52,4 @@ public class JavaNamespaceDescriptor extends AbstractNamespaceDescriptorImpl { public FqName getQualifiedName() { return qualifiedName; } - - public boolean isNamespace() { - return namespace; - } }