Simplify class object naming madness

- get rid of DescriptorNamer, always use descriptor.getName() instead
- delete AbstractClassResolver.getClassObjectName(), always use
  "<class-object-for-...>", except for the case of built-ins serialization
  (class object names should be replaced by "object" when writing files with
  serialized data for built-ins)
- delete NestedClassResolver.resolveClassObject(), always use the other method
  of this class instead
This commit is contained in:
Alexander Udalov
2013-07-01 19:26:38 +04:00
parent 5db2ecd1fc
commit f9ad6827d4
190 changed files with 103 additions and 215 deletions
@@ -32,7 +32,6 @@ import org.jetbrains.jet.lang.descriptors.ClassOrNamespaceDescriptor;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.java.JvmAbi;
import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
import org.jetbrains.jet.lang.resolve.lazy.storage.LockBasedStorageManager;
@@ -268,7 +267,7 @@ public final class DeserializedDescriptorResolver {
@NotNull
@Override
protected ClassId getClassId(@NotNull ClassDescriptor classDescriptor) {
return ClassSerializationUtil.getClassId(classDescriptor, DescriptorNamer.DEFAULT);
return ClassSerializationUtil.getClassId(classDescriptor);
}
@Nullable
@@ -277,12 +276,6 @@ public final class DeserializedDescriptorResolver {
return javaClassResolver.resolveClass(kotlinFqNameToJavaFqName(classId.asSingleFqName()));
}
@NotNull
@Override
protected Name getClassObjectName(@NotNull ClassDescriptor outerClass) {
return DescriptorUtils.getClassObjectName(outerClass.getName());
}
@Override
protected void classDescriptorCreated(@NotNull ClassDescriptor classDescriptor) {
//nothing to do here