From 75479c7acda95e4728c37bc92e2e88325c264cc6 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Wed, 12 Sep 2012 17:56:12 +0400 Subject: [PATCH] extracted method mapPlatformClass(FqName) --- .../resolve/java/JavaToKotlinClassMap.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaToKotlinClassMap.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaToKotlinClassMap.java index 1642b77c6b6..4f54a81bfcf 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaToKotlinClassMap.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaToKotlinClassMap.java @@ -149,14 +149,8 @@ public class JavaToKotlinClassMap implements PlatformToKotlinClassMap { packagesWithMappedClasses.put(javaClassName.parent(), kotlinDescriptor); } - @Override @NotNull - public Collection mapPlatformClass(@NotNull ClassDescriptor classDescriptor) { - FqNameUnsafe className = DescriptorUtils.getFQName(classDescriptor); - if (!className.isSafe()) { - return Collections.emptyList(); - } - FqName fqName = className.toSafe(); + public Collection mapPlatformClass(@NotNull FqName fqName) { ClassDescriptor kotlinAnalog = classDescriptorMap.get(fqName); ClassDescriptor kotlinCovariantAnalog = classDescriptorMapForCovariantPositions.get(fqName); List descriptors = Lists.newArrayList(); @@ -169,6 +163,16 @@ public class JavaToKotlinClassMap implements PlatformToKotlinClassMap { return descriptors; } + @Override + @NotNull + public Collection mapPlatformClass(@NotNull ClassDescriptor classDescriptor) { + FqNameUnsafe className = DescriptorUtils.getFQName(classDescriptor); + if (!className.isSafe()) { + return Collections.emptyList(); + } + return mapPlatformClass(className.toSafe()); + } + @Override @NotNull public Collection mapPlatformClassesInside(@NotNull DeclarationDescriptor containingDeclaration) {