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

getName()/getFqName() -> asString()

Browse Source
This commit is contained in:
Andrey Breslav
2013-05-22 20:39:33 +04:00
committed by Alexander Udalov
parent 1026a63778
commit b536b3961e
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassId.java
+1 -1
View File
@@ -32,7 +32,7 @@ public final class ClassId {
public FqNameUnsafe asSingleFqName() { public FqNameUnsafe asSingleFqName() {
if (packageFqName.isRoot()) return relativeClassName; if (packageFqName.isRoot()) return relativeClassName;
return new FqNameUnsafe(packageFqName.getFqName() + "." + relativeClassName.getFqName()); return new FqNameUnsafe(packageFqName.asString() + "." + relativeClassName.asString());
} }
@Override @Override
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java
+2 -2
View File
@@ -115,7 +115,7 @@ public class DeserializedClassDescriptor extends ClassDescriptorBase implements
private static Set<String> stringSet(@NotNull List<Integer> nameIndices, @NotNull NameResolver nameResolver) { private static Set<String> stringSet(@NotNull List<Integer> nameIndices, @NotNull NameResolver nameResolver) {
Set<String> result = new HashSet<String>(nameIndices.size()); Set<String> result = new HashSet<String>(nameIndices.size());
for (Integer index : nameIndices) { for (Integer index : nameIndices) {
result.add(nameResolver.getName(index).getName()); result.add(nameResolver.getName(index).asString());
} }
return result; return result;
} }
@@ -395,7 +395,7 @@ public class DeserializedClassDescriptor extends ClassDescriptorBase implements
@Nullable @Nullable
@Override @Override
protected final ClassDescriptor doCompute(@NotNull Name name) { protected final ClassDescriptor doCompute(@NotNull Name name) {
if (!declaredNames.contains(name.getName())) return null; if (!declaredNames.contains(name.asString())) return null;
return resolveNestedClass(name); return resolveNestedClass(name);
} }
compiler/tests/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorSerializationTest.java
+2 -2
View File
@@ -226,7 +226,7 @@ public abstract class AbstractDescriptorSerializationTest extends KotlinTestWith
ClassDescriptor classDescriptor = (ClassDescriptor) descriptor; ClassDescriptor classDescriptor = (ClassDescriptor) descriptor;
if (classDescriptor.getKind() == ClassKind.CLASS_OBJECT) return JvmAbi.CLASS_OBJECT_CLASS_NAME; if (classDescriptor.getKind() == ClassKind.CLASS_OBJECT) return JvmAbi.CLASS_OBJECT_CLASS_NAME;
} }
return descriptor.getName().getName(); return descriptor.getName().asString();
} }
private static NamespaceDescriptorImpl createTestNamespace() { private static NamespaceDescriptorImpl createTestNamespace() {
@@ -336,7 +336,7 @@ public abstract class AbstractDescriptorSerializationTest extends KotlinTestWith
) { ) {
FqNameUnsafe fqName = classId.asSingleFqName(); FqNameUnsafe fqName = classId.asSingleFqName();
ClassMetadata classMetadata = this.classMetadata.fun(fqName.getFqName()); ClassMetadata classMetadata = this.classMetadata.fun(fqName.asString());
if (classMetadata == null) { if (classMetadata == null) {
return parentResolver.findClass(classId); return parentResolver.findClass(classId);
} }