remove useless field in JavaNamespaceDescriptor

This commit is contained in:
Stepan Koltsov
2012-04-08 23:23:59 +04:00
parent ee24554e28
commit b0325f14ef
2 changed files with 4 additions and 13 deletions
@@ -907,8 +907,7 @@ public class JavaDescriptorResolver {
(NamespaceDescriptorParent) resolveParentDescriptor(psiPackage), (NamespaceDescriptorParent) resolveParentDescriptor(psiPackage),
Collections.<AnnotationDescriptor>emptyList(), // TODO Collections.<AnnotationDescriptor>emptyList(), // TODO
name == null ? JAVA_ROOT : name, name == null ? JAVA_ROOT : name,
fqName, fqName
true
); );
trace.record(BindingContext.NAMESPACE, psiPackage, namespaceDescriptor); trace.record(BindingContext.NAMESPACE, psiPackage, namespaceDescriptor);
@@ -997,8 +996,7 @@ public class JavaDescriptorResolver {
resolveNamespace(fqName.parent(), DescriptorSearchRule.INCLUDE_KOTLIN), resolveNamespace(fqName.parent(), DescriptorSearchRule.INCLUDE_KOTLIN),
Collections.<AnnotationDescriptor>emptyList(), // TODO Collections.<AnnotationDescriptor>emptyList(), // TODO
psiClass.getName(), psiClass.getName(),
fqName, fqName
false
); );
ResolverNamespaceData scopeData = createNamespaceResolverScopeData(fqName, ns); ResolverNamespaceData scopeData = createNamespaceResolverScopeData(fqName, ns);
@@ -32,14 +32,11 @@ import java.util.List;
public class JavaNamespaceDescriptor extends AbstractNamespaceDescriptorImpl { public class JavaNamespaceDescriptor extends AbstractNamespaceDescriptorImpl {
private JetScope memberScope; private JetScope memberScope;
private final FqName qualifiedName; private final FqName qualifiedName;
/** Namespace of class with static methods */
private final boolean namespace;
public JavaNamespaceDescriptor(NamespaceDescriptorParent containingDeclaration, List<AnnotationDescriptor> annotations, public JavaNamespaceDescriptor(NamespaceDescriptorParent containingDeclaration, List<AnnotationDescriptor> annotations,
@NotNull String name, @NotNull FqName qualifiedName, boolean namespace) { @NotNull String name, @NotNull FqName qualifiedName) {
super(containingDeclaration, annotations, name); super(containingDeclaration, annotations, name);
this.qualifiedName = qualifiedName; this.qualifiedName = qualifiedName;
this.namespace = namespace;
} }
public void setMemberScope(@NotNull JetScope memberScope) { public void setMemberScope(@NotNull JetScope memberScope) {
@@ -55,8 +52,4 @@ public class JavaNamespaceDescriptor extends AbstractNamespaceDescriptorImpl {
public FqName getQualifiedName() { public FqName getQualifiedName() {
return qualifiedName; return qualifiedName;
} }
public boolean isNamespace() {
return namespace;
}
} }