From 0c48982cda4f091959e19472568e09ed514d962f Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 9 Sep 2011 20:15:28 +0400 Subject: [PATCH] Small cleanup --- .../jetbrains/jet/lang/resolve/TypeHierarchyResolver.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/idea/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java b/idea/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java index 9d27a9f3a50..74a5f264c74 100644 --- a/idea/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java +++ b/idea/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java @@ -40,16 +40,13 @@ public class TypeHierarchyResolver { declaration.accept(new JetVisitorVoid() { @Override public void visitNamespace(JetNamespace namespace) { + String name = JetPsiUtil.safeName(namespace.getName()); - String name = namespace.getName(); - if (name == null) { - name = ""; - } NamespaceDescriptorImpl namespaceDescriptor = owner.getNamespace(name); if (namespaceDescriptor == null) { namespaceDescriptor = new NamespaceDescriptorImpl( owner.getOriginal(), - Collections.emptyList(), // TODO + Collections.emptyList(), // TODO: annotations name ); namespaceDescriptor.initialize(new WritableScopeImpl(JetScope.EMPTY, namespaceDescriptor, context.getTrace().getErrorHandler()).setDebugName("Namespace member scope"));