azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename ClassResolver -> DescriptorFinder

Browse Source 
Avoid clash with JavaDescriptorResolver naming conventions
This commit is contained in:
Pavel V. Talanov
2013-07-01 20:14:20 +04:00
committed by Alexander Udalov
parent c3a44e37ba
commit c3b1716e29
11 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DeserializedDescriptorResolver.java
+5 -5
View File
@@ -153,9 +153,9 @@ public final class DeserializedDescriptorResolver {
@NotNull ClassOrNamespaceDescriptor containingDeclaration
) {
ClassId classId = ClassId.fromFqNameAndContainingDeclaration(fqName, containingDeclaration);
AbstractClassResolver classResolver =
new DeserializedClassResolver(storageManager, DUMMY_ANNOTATION_DESERIALIZER, classId, classData);
ClassDescriptor classDescriptor = classResolver.findClassInternally(classId);
AbstractDescriptorFinder descriptorFinder =
new DeserializedDescriptorFinder(storageManager, DUMMY_ANNOTATION_DESERIALIZER, classId, classData);
ClassDescriptor classDescriptor = descriptorFinder.findClassInternally(classId);
assert classDescriptor != null : "Could not correctly deserialize class " + fqName.asString();
return classDescriptor;
}
@@ -230,13 +230,13 @@ public final class DeserializedDescriptorResolver {
return FqName.fromSegments(correctedSegments);
}
public class DeserializedClassResolver extends AbstractClassResolver {
public class DeserializedDescriptorFinder extends AbstractDescriptorFinder {
@NotNull
private final ClassId classID;
@NotNull
private final ClassData classData;
public DeserializedClassResolver(
public DeserializedDescriptorFinder(
@NotNull StorageManager storageManager,
@NotNull AnnotationDeserializer annotationDeserializer,
@NotNull ClassId id,