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

Drop unused parameter in JavaToKotlinClassMap and subclasses

Browse Source
This commit is contained in:
Alexander Udalov
2015-02-24 15:26:05 +03:00
parent fca7a8c4a2
commit b99b1883bc
4 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/CollectionClassMapping.java
+1 -2
View File
@@ -50,8 +50,7 @@ public class CollectionClassMapping extends JavaToKotlinClassMapBuilder {
protected void register( protected void register(
@NotNull Class<?> javaClass, @NotNull Class<?> javaClass,
@NotNull ClassDescriptor kotlinDescriptor, @NotNull ClassDescriptor kotlinDescriptor,
@NotNull ClassDescriptor kotlinMutableDescriptor, @NotNull ClassDescriptor kotlinMutableDescriptor
@NotNull Direction direction
) { ) {
mapBuilder.put(kotlinMutableDescriptor, kotlinDescriptor); mapBuilder.put(kotlinMutableDescriptor, kotlinDescriptor);
} }
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/types/KotlinToJavaTypesMap.java
+3 -6
View File
@@ -104,13 +104,10 @@ public class KotlinToJavaTypesMap extends JavaToKotlinClassMapBuilder {
protected void register( protected void register(
@NotNull Class<?> javaClass, @NotNull Class<?> javaClass,
@NotNull ClassDescriptor kotlinDescriptor, @NotNull ClassDescriptor kotlinDescriptor,
@NotNull ClassDescriptor kotlinMutableDescriptor, @NotNull ClassDescriptor kotlinMutableDescriptor
@NotNull Direction direction
) { ) {
if (direction == Direction.BOTH || direction == Direction.KOTLIN_TO_JAVA) { register(javaClass, kotlinDescriptor, Direction.BOTH);
register(javaClass, kotlinDescriptor); register(javaClass, kotlinMutableDescriptor, Direction.BOTH);
register(javaClass, kotlinMutableDescriptor);
}
} }
private void register(@NotNull FqName fqName, @NotNull Type type) { private void register(@NotNull FqName fqName, @NotNull Type type) {
core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java
+4 -7
View File
@@ -97,14 +97,11 @@ public class JavaToKotlinClassMap extends JavaToKotlinClassMapBuilder implements
protected void register( protected void register(
@NotNull Class<?> javaClass, @NotNull Class<?> javaClass,
@NotNull ClassDescriptor kotlinDescriptor, @NotNull ClassDescriptor kotlinDescriptor,
@NotNull ClassDescriptor kotlinMutableDescriptor, @NotNull ClassDescriptor kotlinMutableDescriptor
@NotNull Direction direction
) { ) {
if (direction == Direction.BOTH || direction == Direction.JAVA_TO_KOTLIN) { FqName javaClassName = fqNameByClass(javaClass);
FqName javaClassName = fqNameByClass(javaClass); register(javaClassName, kotlinDescriptor);
register(javaClassName, kotlinDescriptor); registerCovariant(javaClassName, kotlinMutableDescriptor);
registerCovariant(javaClassName, kotlinMutableDescriptor);
}
} }
private void register(@NotNull FqName javaClassName, @NotNull ClassDescriptor kotlinDescriptor) { private void register(@NotNull FqName javaClassName, @NotNull ClassDescriptor kotlinDescriptor) {
core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMapBuilder.java
+8 -6
View File
@@ -17,8 +17,8 @@
package org.jetbrains.kotlin.platform; package org.jetbrains.kotlin.platform;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.descriptors.ClassDescriptor;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.kotlin.descriptors.ClassDescriptor;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.util.*; import java.util.*;
@@ -56,13 +56,15 @@ public abstract class JavaToKotlinClassMapBuilder {
register(ListIterator.class, kotlinBuiltIns.getListIterator(), kotlinBuiltIns.getMutableListIterator()); 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); register(javaClass, kotlinDescriptor, Direction.BOTH);
} }
protected abstract void register(@NotNull Class<?> javaClass, @NotNull ClassDescriptor kotlinDescriptor, @NotNull Direction direction); 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) { protected abstract void register(
register(javaClass, kotlinDescriptor, kotlinMutableDescriptor, Direction.BOTH); @NotNull Class<?> javaClass,
} @NotNull ClassDescriptor kotlinDescriptor,
protected abstract void register(@NotNull Class<?> javaClass, @NotNull ClassDescriptor kotlinDescriptor, @NotNull ClassDescriptor kotlinMutableDescriptor, @NotNull Direction direction); @NotNull ClassDescriptor kotlinMutableDescriptor
);
} }