From b0325f14ef45cc1cdd48308d1711b679fe31ed77 Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Sun, 8 Apr 2012 23:23:59 +0400
Subject: [PATCH] remove useless field in JavaNamespaceDescriptor

---
 .../jet/lang/resolve/java/JavaDescriptorResolver.java |  6 ++----
 .../lang/resolve/java/JavaNamespaceDescriptor.java    | 11 ++---------
 2 files changed, 4 insertions(+), 13 deletions(-)

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.<AnnotationDescriptor>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.<AnnotationDescriptor>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<AnnotationDescriptor> 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;
-    }
 }