diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameSerializationUtil.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameSerializationUtil.java index 82486cda169..4f9ed2854d8 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameSerializationUtil.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameSerializationUtil.java @@ -56,4 +56,11 @@ public class NameSerializationUtil { } return qualifiedNames.build(); } + + @NotNull + public static NameResolver createNameResolver(@NotNull NameTable table) { + return new NameResolver( + toSimpleNameTable(table), + toQualifiedNameTable(table)); + } } diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameTable.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameTable.java index ed375dfe7a6..09307426316 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameTable.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameTable.java @@ -52,6 +52,20 @@ public class NameTable { }; public interface Namer { + Namer DEFAULT = new NameTable.Namer() { + @NotNull + @Override + public Name getClassName(@NotNull ClassDescriptor classDescriptor) { + return classDescriptor.getName(); + } + + @NotNull + @Override + public Name getPackageName(@NotNull NamespaceDescriptor namespaceDescriptor) { + return namespaceDescriptor.getName(); + } + }; + @NotNull Name getClassName(@NotNull ClassDescriptor classDescriptor);