From 87847fac85d04b1cce48eff30aa749cd6b91c0ae Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Fri, 30 Mar 2012 01:11:03 +0400 Subject: [PATCH] unhardcode identifiers --- .../org/jetbrains/k2js/translate/utils/DescriptorUtils.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java index 0478674c523..0372ba38440 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/utils/DescriptorUtils.java @@ -241,8 +241,7 @@ public final class DescriptorUtils { if (containedInModule) { return true; } - //TODO - return containingDeclaration.getName().equals(""); + return containingDeclaration.getContainingDeclaration() instanceof ModuleDescriptor; } @NotNull @@ -276,7 +275,7 @@ public final class DescriptorUtils { public static List getNamespaceDescriptorHierarchy(@NotNull NamespaceDescriptor namespaceDescriptor) { List result = Lists.newArrayList(namespaceDescriptor); NamespaceDescriptor current = namespaceDescriptor; - while (!current.getName().equals("")) { + while (!(current.getContainingDeclaration() instanceof ModuleDescriptor)) { result.add(current); if (current.getContainingDeclaration() instanceof NamespaceDescriptor) { current = (NamespaceDescriptor)current.getContainingDeclaration();