From b536b3961e0ce419ccb26f3bfe36ee5dadb5fdb4 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Wed, 22 May 2013 20:39:33 +0400
Subject: [PATCH] getName()/getFqName() -> asString()

---
 .../org/jetbrains/jet/descriptors/serialization/ClassId.java  | 2 +-
 .../descriptors/DeserializedClassDescriptor.java              | 4 ++--
 .../serialization/AbstractDescriptorSerializationTest.java    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassId.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassId.java
index d7cf0310b23..b984ffefc59 100644
--- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassId.java
+++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassId.java
@@ -32,7 +32,7 @@ public final class ClassId {
 
     public FqNameUnsafe asSingleFqName() {
         if (packageFqName.isRoot()) return relativeClassName;
-        return new FqNameUnsafe(packageFqName.getFqName() + "." + relativeClassName.getFqName());
+        return new FqNameUnsafe(packageFqName.asString() + "." + relativeClassName.asString());
     }
 
     @Override
diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java
index 0d54bd0a9d5..ffa59787b86 100644
--- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java
+++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java
@@ -115,7 +115,7 @@ public class DeserializedClassDescriptor extends ClassDescriptorBase implements
     private static Set<String> stringSet(@NotNull List<Integer> nameIndices, @NotNull NameResolver nameResolver) {
         Set<String> result = new HashSet<String>(nameIndices.size());
         for (Integer index : nameIndices) {
-            result.add(nameResolver.getName(index).getName());
+            result.add(nameResolver.getName(index).asString());
         }
         return result;
     }
@@ -395,7 +395,7 @@ public class DeserializedClassDescriptor extends ClassDescriptorBase implements
         @Nullable
         @Override
         protected final ClassDescriptor doCompute(@NotNull Name name) {
-            if (!declaredNames.contains(name.getName())) return null;
+            if (!declaredNames.contains(name.asString())) return null;
 
             return resolveNestedClass(name);
         }
diff --git a/compiler/tests/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorSerializationTest.java b/compiler/tests/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorSerializationTest.java
index d5d5d492cf1..1c1a17e4d16 100644
--- a/compiler/tests/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorSerializationTest.java
+++ b/compiler/tests/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorSerializationTest.java
@@ -226,7 +226,7 @@ public abstract class AbstractDescriptorSerializationTest extends KotlinTestWith
             ClassDescriptor classDescriptor = (ClassDescriptor) descriptor;
             if (classDescriptor.getKind() == ClassKind.CLASS_OBJECT) return JvmAbi.CLASS_OBJECT_CLASS_NAME;
         }
-        return descriptor.getName().getName();
+        return descriptor.getName().asString();
     }
 
     private static NamespaceDescriptorImpl createTestNamespace() {
@@ -336,7 +336,7 @@ public abstract class AbstractDescriptorSerializationTest extends KotlinTestWith
         ) {
             FqNameUnsafe fqName = classId.asSingleFqName();
 
-            ClassMetadata classMetadata = this.classMetadata.fun(fqName.getFqName());
+            ClassMetadata classMetadata = this.classMetadata.fun(fqName.asString());
             if (classMetadata == null) {
                 return parentResolver.findClass(classId);
             }