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

Pull Java<->Kotlin primitive type mapping up to JavaToKotlinClassMapBuilder

Browse Source
This commit is contained in:
Alexander Udalov
2015-04-22 04:49:07 +03:00
parent 4b07ec11ea
commit b956fb5eb0
4 changed files with 17 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/types/KotlinToJavaTypesMap.java
+1 -17
View File
@@ -18,13 +18,11 @@ package org.jetbrains.kotlin.resolve.jvm.types;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.kotlin.descriptors.ClassDescriptor;
import org.jetbrains.kotlin.name.ClassId;
import org.jetbrains.kotlin.name.FqNameUnsafe;
import org.jetbrains.kotlin.platform.JavaToKotlinClassMapBuilder;
import org.jetbrains.kotlin.resolve.DescriptorUtils;
import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType;
import java.util.HashMap;
import java.util.Map;
@@ -44,16 +42,6 @@ public class KotlinToJavaTypesMap extends JavaToKotlinClassMapBuilder {
private KotlinToJavaTypesMap() {
init();
initPrimitives();
}
private void initPrimitives() {
for (JvmPrimitiveType type : JvmPrimitiveType.values()) {
register(
KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME.child(type.getPrimitiveType().getTypeName()).toUnsafe(),
ClassId.topLevel(type.getWrapperFqName())
);
}
}
/**
@@ -71,7 +59,7 @@ public class KotlinToJavaTypesMap extends JavaToKotlinClassMapBuilder {
@Override
protected void register(@NotNull ClassId javaClassId, @NotNull ClassDescriptor kotlinDescriptor, @NotNull Direction direction) {
if (direction == Direction.BOTH || direction == Direction.KOTLIN_TO_JAVA) {
register(DescriptorUtils.getFqName(kotlinDescriptor), javaClassId);
map.put(DescriptorUtils.getFqName(kotlinDescriptor), javaClassId);
}
}
@@ -84,8 +72,4 @@ public class KotlinToJavaTypesMap extends JavaToKotlinClassMapBuilder {
register(javaClassId, kotlinDescriptor, Direction.BOTH);
register(javaClassId, kotlinMutableDescriptor, Direction.BOTH);
}
private void register(@NotNull FqNameUnsafe kotlinFqName, @NotNull ClassId javaClassId) {
map.put(kotlinFqName, javaClassId);
}
}