From ed92eb1d17cb37f23da1657f86798704ff540ad8 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Tue, 16 Sep 2014 11:32:45 +0400
Subject: [PATCH] Minor, use another constructor of ClassId

---
 .../org/jetbrains/jet/lang/resolve/java/PackageClassUtils.java | 3 +--
 .../lang/resolve/java/lazy/descriptors/LazyJavaStaticScope.kt  | 2 +-
 .../jet/lang/resolve/kotlin/DeserializedResolverUtils.java     | 2 +-
 .../org/jetbrains/jet/descriptors/serialization/ClassId.java   | 2 +-
 .../descriptors/DeserializedPackageMemberScope.java            | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/PackageClassUtils.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/PackageClassUtils.java
index f5a4d98b12a..2407858aa30 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/PackageClassUtils.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/PackageClassUtils.java
@@ -19,7 +19,6 @@ package org.jetbrains.jet.lang.resolve.java;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.descriptors.serialization.ClassId;
 import org.jetbrains.jet.lang.resolve.name.FqName;
-import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
 import org.jetbrains.jet.lang.resolve.name.Name;
 
 public final class PackageClassUtils {
@@ -50,7 +49,7 @@ public final class PackageClassUtils {
 
     @NotNull
     public static ClassId getPackageClassId(@NotNull FqName packageFQN) {
-        return new ClassId(packageFQN, FqNameUnsafe.topLevel(Name.identifier(getPackageClassName(packageFQN))));
+        return new ClassId(packageFQN, Name.identifier(getPackageClassName(packageFQN)));
     }
 
     @NotNull
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticScope.kt
index 633911980b0..150c091648e 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticScope.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticScope.kt
@@ -93,7 +93,7 @@ public class LazyPackageFragmentScopeForJavaPackage(
 
     private val classes = c.storageManager.createMemoizedFunctionWithNullableValues<Name, ClassDescriptor> {
         name ->
-        val classId = ClassId(packageFragment.fqName, FqNameUnsafe.topLevel(SpecialNames.safeIdentifier(name)))
+        val classId = ClassId(packageFragment.fqName, SpecialNames.safeIdentifier(name))
         val (jClass, kClass) = c.findClassInJava(classId)
         if (kClass != null)
             kClass
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedResolverUtils.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedResolverUtils.java
index b5aee261076..313caec2e51 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedResolverUtils.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedResolverUtils.java
@@ -77,7 +77,7 @@ public class DeserializedResolverUtils {
     public static ClassId getClassId(@NotNull ClassDescriptor descriptor) {
         DeclarationDescriptor owner = descriptor.getContainingDeclaration();
         if (owner instanceof PackageFragmentDescriptor) {
-            return new ClassId(((PackageFragmentDescriptor) owner).getFqName(), FqNameUnsafe.topLevel(descriptor.getName()));
+            return new ClassId(((PackageFragmentDescriptor) owner).getFqName(), descriptor.getName());
         }
         return getClassId((ClassDescriptor) owner).createNestedClassId(descriptor.getName());
     }
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassId.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassId.java
index 811e717d3a0..5f075c6b9b3 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassId.java
+++ b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassId.java
@@ -25,7 +25,7 @@ public final class ClassId {
 
     @NotNull
     public static ClassId topLevel(@NotNull FqName topLevelFqName) {
-        return new ClassId(topLevelFqName.parent(), FqNameUnsafe.topLevel(topLevelFqName.shortName()));
+        return new ClassId(topLevelFqName.parent(), topLevelFqName.shortName());
     }
 
     private final FqName packageFqName;
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java
index 37fbfd55726..f0472d5e638 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java
+++ b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java
@@ -65,7 +65,7 @@ public class DeserializedPackageMemberScope extends DeserializedMemberScope {
     @Nullable
     @Override
     protected ClassDescriptor getClassDescriptor(@NotNull Name name) {
-        return ContextPackage.deserializeClass(context, new ClassId(packageFqName, FqNameUnsafe.topLevel(name)));
+        return ContextPackage.deserializeClass(context, new ClassId(packageFqName, name));
     }
 
     @Override