From 49178e6cff8d712821749240ab5953ad3bb94a22 Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Sun, 17 Jun 2012 00:40:41 +0400
Subject: [PATCH] remove constructor parameter of JavaNamespaceDescriptor

---
 .../jet/lang/resolve/java/JavaDescriptorResolver.java  |  2 --
 .../jet/lang/resolve/java/JavaNamespaceDescriptor.java |  4 ++--
 .../org/jetbrains/jet/lang/resolve/name/FqName.java    |  5 +++++
 .../jetbrains/jet/lang/resolve/name/FqNameUnsafe.java  | 10 ++++++++++
 4 files changed, 17 insertions(+), 4 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 ef326159950..5bbdc73ba26 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
@@ -37,7 +37,6 @@ import org.jetbrains.jet.lang.resolve.constants.StringValue;
 import org.jetbrains.jet.lang.resolve.java.kt.JetClassAnnotation;
 import org.jetbrains.jet.lang.resolve.java.kt.PsiAnnotationWithFlags;
 import org.jetbrains.jet.lang.resolve.name.FqName;
-import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.resolve.name.NamePredicate;
 import org.jetbrains.jet.lang.types.*;
@@ -694,7 +693,6 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
         JavaNamespaceDescriptor ns = new JavaNamespaceDescriptor(
                 parentNs,
                 Collections.<AnnotationDescriptor>emptyList(), // TODO
-                qualifiedName.isRoot() ? FqNameUnsafe.ROOT_NAME : qualifiedName.shortName(),
                 qualifiedName
         );
 
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 fee049a5ed2..ceb7f036dad 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
@@ -34,8 +34,8 @@ public class JavaNamespaceDescriptor extends AbstractNamespaceDescriptorImpl {
     private final FqName qualifiedName;
 
     public JavaNamespaceDescriptor(NamespaceDescriptorParent containingDeclaration, List<AnnotationDescriptor> annotations,
-            @NotNull Name name, @NotNull FqName qualifiedName) {
-        super(containingDeclaration, annotations, name);
+            @NotNull FqName qualifiedName) {
+        super(containingDeclaration, annotations, qualifiedName.shortNameOrSpecial());
         this.qualifiedName = qualifiedName;
     }
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqName.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqName.java
index 295170ed043..24bbd74c299 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqName.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqName.java
@@ -110,6 +110,11 @@ public class FqName extends FqNameBase {
         return fqName.shortName();
     }
 
+    @NotNull
+    public Name shortNameOrSpecial() {
+        return fqName.shortNameOrSpecial();
+    }
+
     @NotNull
     public List<FqName> path() {
         final List<FqName> path = Lists.newArrayList();
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqNameUnsafe.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqNameUnsafe.java
index c14128d31b5..9745c8d1440 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqNameUnsafe.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqNameUnsafe.java
@@ -146,6 +146,16 @@ public class FqNameUnsafe extends FqNameBase {
         return shortName;
     }
 
+    @NotNull
+    public Name shortNameOrSpecial() {
+        if (isRoot()) {
+            return ROOT_NAME;
+        }
+        else {
+            return shortName();
+        }
+    }
+
     interface WalkCallback {
         void segment(@NotNull Name shortName, @NotNull FqNameUnsafe fqName);
     }