remove constructor parameter of JavaNamespaceDescriptor

2012-06-17 00:40:41 +04:00
parent 9ddbe4a414
commit 49178e6cff
4 changed files with 17 additions and 4 deletions
@@ -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();
@@ -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);
    }