From b99b1883bc3bb2cbd06726c19301b7b59bb8193f Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 24 Feb 2015 15:26:05 +0300 Subject: [PATCH] Drop unused parameter in JavaToKotlinClassMap and subclasses --- .../kotlinSignature/CollectionClassMapping.java | 3 +-- .../resolve/jvm/types/KotlinToJavaTypesMap.java | 9 +++------ .../kotlin/platform/JavaToKotlinClassMap.java | 11 ++++------- .../platform/JavaToKotlinClassMapBuilder.java | 14 ++++++++------ 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/CollectionClassMapping.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/CollectionClassMapping.java index bd3cc888f20..a9c5f55b11b 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/CollectionClassMapping.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/CollectionClassMapping.java @@ -50,8 +50,7 @@ public class CollectionClassMapping extends JavaToKotlinClassMapBuilder { protected void register( @NotNull Class javaClass, @NotNull ClassDescriptor kotlinDescriptor, - @NotNull ClassDescriptor kotlinMutableDescriptor, - @NotNull Direction direction + @NotNull ClassDescriptor kotlinMutableDescriptor ) { mapBuilder.put(kotlinMutableDescriptor, kotlinDescriptor); } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/types/KotlinToJavaTypesMap.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/types/KotlinToJavaTypesMap.java index 72abab1ebdc..43158ff7278 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/types/KotlinToJavaTypesMap.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/types/KotlinToJavaTypesMap.java @@ -104,13 +104,10 @@ public class KotlinToJavaTypesMap extends JavaToKotlinClassMapBuilder { protected void register( @NotNull Class javaClass, @NotNull ClassDescriptor kotlinDescriptor, - @NotNull ClassDescriptor kotlinMutableDescriptor, - @NotNull Direction direction + @NotNull ClassDescriptor kotlinMutableDescriptor ) { - if (direction == Direction.BOTH || direction == Direction.KOTLIN_TO_JAVA) { - register(javaClass, kotlinDescriptor); - register(javaClass, kotlinMutableDescriptor); - } + register(javaClass, kotlinDescriptor, Direction.BOTH); + register(javaClass, kotlinMutableDescriptor, Direction.BOTH); } private void register(@NotNull FqName fqName, @NotNull Type type) { diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java index 3c634dbc4e7..0d7598047db 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java @@ -97,14 +97,11 @@ public class JavaToKotlinClassMap extends JavaToKotlinClassMapBuilder implements protected void register( @NotNull Class javaClass, @NotNull ClassDescriptor kotlinDescriptor, - @NotNull ClassDescriptor kotlinMutableDescriptor, - @NotNull Direction direction + @NotNull ClassDescriptor kotlinMutableDescriptor ) { - if (direction == Direction.BOTH || direction == Direction.JAVA_TO_KOTLIN) { - FqName javaClassName = fqNameByClass(javaClass); - register(javaClassName, kotlinDescriptor); - registerCovariant(javaClassName, kotlinMutableDescriptor); - } + FqName javaClassName = fqNameByClass(javaClass); + register(javaClassName, kotlinDescriptor); + registerCovariant(javaClassName, kotlinMutableDescriptor); } private void register(@NotNull FqName javaClassName, @NotNull ClassDescriptor kotlinDescriptor) { diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMapBuilder.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMapBuilder.java index c6ad2c791fa..3413fbd75e7 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMapBuilder.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMapBuilder.java @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.platform; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; import java.lang.annotation.Annotation; import java.util.*; @@ -56,13 +56,15 @@ public abstract class JavaToKotlinClassMapBuilder { register(ListIterator.class, kotlinBuiltIns.getListIterator(), kotlinBuiltIns.getMutableListIterator()); } - protected void register(@NotNull Class javaClass, @NotNull ClassDescriptor kotlinDescriptor) { + private void register(@NotNull Class javaClass, @NotNull ClassDescriptor kotlinDescriptor) { register(javaClass, kotlinDescriptor, Direction.BOTH); } + protected abstract void register(@NotNull Class javaClass, @NotNull ClassDescriptor kotlinDescriptor, @NotNull Direction direction); - /*package*/ void register(@NotNull Class javaClass, @NotNull ClassDescriptor kotlinDescriptor, @NotNull ClassDescriptor kotlinMutableDescriptor) { - register(javaClass, kotlinDescriptor, kotlinMutableDescriptor, Direction.BOTH); - } - protected abstract void register(@NotNull Class javaClass, @NotNull ClassDescriptor kotlinDescriptor, @NotNull ClassDescriptor kotlinMutableDescriptor, @NotNull Direction direction); + protected abstract void register( + @NotNull Class javaClass, + @NotNull ClassDescriptor kotlinDescriptor, + @NotNull ClassDescriptor kotlinMutableDescriptor + ); }