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

Minor, use another constructor of ClassId

Browse Source
This commit is contained in:
Alexander Udalov
2014-09-16 11:32:45 +04:00
parent b0539ac7a4
commit ed92eb1d17
5 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/PackageClassUtils.java
+1 -2
View File
@@ -19,7 +19,6 @@ package org.jetbrains.jet.lang.resolve.java;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.descriptors.serialization.ClassId; import org.jetbrains.jet.descriptors.serialization.ClassId;
import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.name.Name;
public final class PackageClassUtils { public final class PackageClassUtils {
@@ -50,7 +49,7 @@ public final class PackageClassUtils {
@NotNull @NotNull
public static ClassId getPackageClassId(@NotNull FqName packageFQN) { 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 @NotNull
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticScope.kt
+1 -1
View File
@@ -93,7 +93,7 @@ public class LazyPackageFragmentScopeForJavaPackage(
private val classes = c.storageManager.createMemoizedFunctionWithNullableValues<Name, ClassDescriptor> { private val classes = c.storageManager.createMemoizedFunctionWithNullableValues<Name, ClassDescriptor> {
name -> 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) val (jClass, kClass) = c.findClassInJava(classId)
if (kClass != null) if (kClass != null)
kClass kClass
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedResolverUtils.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class DeserializedResolverUtils {
public static ClassId getClassId(@NotNull ClassDescriptor descriptor) { public static ClassId getClassId(@NotNull ClassDescriptor descriptor) {
DeclarationDescriptor owner = descriptor.getContainingDeclaration(); DeclarationDescriptor owner = descriptor.getContainingDeclaration();
if (owner instanceof PackageFragmentDescriptor) { 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()); return getClassId((ClassDescriptor) owner).createNestedClassId(descriptor.getName());
} }
core/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassId.java
+1 -1
View File
@@ -25,7 +25,7 @@ public final class ClassId {
@NotNull @NotNull
public static ClassId topLevel(@NotNull FqName topLevelFqName) { 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; private final FqName packageFqName;
core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class DeserializedPackageMemberScope extends DeserializedMemberScope {
@Nullable @Nullable
@Override @Override
protected ClassDescriptor getClassDescriptor(@NotNull Name name) { 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 @Override