Minor: fix warnings in KotlinTypeMapper.java

This commit is contained in:
Nikolay Krasko
2017-04-10 14:53:06 +03:00
parent 172bee58b4
commit cc3b6998b1
@@ -269,7 +269,7 @@ public class KotlinTypeMapper {
return implClassId; return implClassId;
} }
@Nullable @NotNull
private static ContainingClassesInfo forPackageMember( private static ContainingClassesInfo forPackageMember(
@NotNull FqName packageFqName, @NotNull FqName packageFqName,
@NotNull String facadeClassName, @NotNull String facadeClassName,
@@ -549,7 +549,7 @@ public class KotlinTypeMapper {
signatureVisitor.writeClassEnd(); signatureVisitor.writeClassEnd();
} }
@Nullable @NotNull
private static String getJvmShortName(@NotNull ClassDescriptor klass) { private static String getJvmShortName(@NotNull ClassDescriptor klass) {
ClassId classId = JavaToKotlinClassMap.INSTANCE.mapKotlinToJava(DescriptorUtils.getFqName(klass)); ClassId classId = JavaToKotlinClassMap.INSTANCE.mapKotlinToJava(DescriptorUtils.getFqName(klass));
if (classId != null) { if (classId != null) {
@@ -989,7 +989,7 @@ public class KotlinTypeMapper {
@NotNull @NotNull
public Method mapAsmMethod(@NotNull FunctionDescriptor descriptor) { public Method mapAsmMethod(@NotNull FunctionDescriptor descriptor) {
return mapSignature(descriptor, true).getAsmMethod(); return mapSignature(descriptor).getAsmMethod();
} }
@NotNull @NotNull
@@ -998,8 +998,8 @@ public class KotlinTypeMapper {
} }
@NotNull @NotNull
private JvmMethodGenericSignature mapSignature(@NotNull FunctionDescriptor f, boolean skipGenericSignature) { private JvmMethodGenericSignature mapSignature(@NotNull FunctionDescriptor f) {
return mapSignature(f, OwnerKind.IMPLEMENTATION, skipGenericSignature); return mapSignature(f, OwnerKind.IMPLEMENTATION, true);
} }
@NotNull @NotNull