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

Minor, swap order of parameters for clarity

Browse Source
This commit is contained in:
Alexander Udalov
2015-05-28 19:14:19 +03:00
parent 6dbd9b2d01
commit dff3e17d88
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java
+7 -7
View File
@@ -82,13 +82,13 @@ public class JavaToKotlinClassMap implements PlatformToKotlinClassMap {
"kotlin.reflect.KMemberFunction", "kotlin.reflect.KMemberFunction",
"kotlin.reflect.KExtensionFunction" "kotlin.reflect.KExtensionFunction"
)) { )) {
addKotlinToJava(ClassId.topLevel(new FqName(kFun)), new FqNameUnsafe(kFun + i)); addKotlinToJava(new FqNameUnsafe(kFun + i), ClassId.topLevel(new FqName(kFun)));
} }
} }
addJavaToKotlin(classId(Deprecated.class), builtIns.getDeprecatedAnnotation()); addJavaToKotlin(classId(Deprecated.class), builtIns.getDeprecatedAnnotation());
addKotlinToJava(classId(Void.class), builtIns.getNothing()); addKotlinToJava(builtIns.getNothing(), classId(Void.class));
} }
/** /**
@@ -130,7 +130,7 @@ public class JavaToKotlinClassMap implements PlatformToKotlinClassMap {
ClassId javaClassId = classId(javaClass); ClassId javaClassId = classId(javaClass);
add(javaClassId, kotlinDescriptor); add(javaClassId, kotlinDescriptor);
addKotlinToJava(javaClassId, kotlinMutableDescriptor); addKotlinToJava(kotlinMutableDescriptor, javaClassId);
mutableToReadOnly.put(kotlinMutableDescriptor, kotlinDescriptor); mutableToReadOnly.put(kotlinMutableDescriptor, kotlinDescriptor);
readOnlyToMutable.put(kotlinDescriptor, kotlinMutableDescriptor); readOnlyToMutable.put(kotlinDescriptor, kotlinMutableDescriptor);
@@ -138,7 +138,7 @@ public class JavaToKotlinClassMap implements PlatformToKotlinClassMap {
private void add(@NotNull ClassId javaClassId, @NotNull ClassDescriptor kotlinDescriptor) { private void add(@NotNull ClassId javaClassId, @NotNull ClassDescriptor kotlinDescriptor) {
addJavaToKotlin(javaClassId, kotlinDescriptor); addJavaToKotlin(javaClassId, kotlinDescriptor);
addKotlinToJava(javaClassId, kotlinDescriptor); addKotlinToJava(kotlinDescriptor, javaClassId);
} }
private void add(@NotNull Class<?> javaClass, @NotNull ClassDescriptor kotlinDescriptor) { private void add(@NotNull Class<?> javaClass, @NotNull ClassDescriptor kotlinDescriptor) {
@@ -149,11 +149,11 @@ public class JavaToKotlinClassMap implements PlatformToKotlinClassMap {
javaToKotlin.put(javaClassId.asSingleFqName(), kotlinDescriptor); javaToKotlin.put(javaClassId.asSingleFqName(), kotlinDescriptor);
} }
private void addKotlinToJava(@NotNull ClassId javaClassId, @NotNull ClassDescriptor kotlinDescriptor) { private void addKotlinToJava(@NotNull ClassDescriptor kotlinDescriptor, @NotNull ClassId javaClassId) {
addKotlinToJava(javaClassId, DescriptorUtils.getFqName(kotlinDescriptor)); addKotlinToJava(DescriptorUtils.getFqName(kotlinDescriptor), javaClassId);
} }
private void addKotlinToJava(@NotNull ClassId javaClassId, @NotNull FqNameUnsafe kotlinFqName) { private void addKotlinToJava(@NotNull FqNameUnsafe kotlinFqName, @NotNull ClassId javaClassId) {
kotlinToJava.put(kotlinFqName, javaClassId); kotlinToJava.put(kotlinFqName, javaClassId);
} }