From ef8504eb39d37e2932ea972ad758e1dcc97313b9 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Tue, 3 Jun 2014 22:13:17 +0400 Subject: [PATCH] Java to Kotlin conversion: minor --- j2k/src/org/jetbrains/jet/j2k/ast/Types.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Types.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Types.kt index 7fec002006b..9a6395b30b5 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/Types.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/Types.kt @@ -22,8 +22,8 @@ import java.util.ArrayList fun Type.isPrimitive(): Boolean = this is PrimitiveType fun Type.isUnit(): Boolean = this == Type.Unit -abstract class MayBeNullableType(nullable: Boolean, val converter: Converter) : Type { - override val isNullable: Boolean = !converter.settings.forceNotNullTypes && nullable +abstract class MayBeNullableType(isNullable: Boolean, val converter: Converter) : Type { + override val isNullable: Boolean = !converter.settings.forceNotNullTypes && isNullable } trait NotNullType : Type { @@ -56,8 +56,8 @@ trait Type : Element { override fun hashCode(): Int = toKotlin().hashCode() } -open class ClassType(val `type`: Identifier, val parameters: List, nullable: Boolean, - converter: Converter) : MayBeNullableType(nullable, converter) { +open class ClassType(val `type`: Identifier, val parameters: List, isNullable: Boolean, + converter: Converter) : MayBeNullableType(isNullable, converter) { override fun toKotlin(): String { // TODO change to map() when KT-2051 is fixed @@ -78,9 +78,9 @@ open class ClassType(val `type`: Identifier, val parameters: List, null class ArrayType( val elementType: Type, - nullable: Boolean, + isNullable: Boolean, converter: Converter -) : MayBeNullableType(nullable, converter) { +) : MayBeNullableType(isNullable, converter) { override fun toKotlin(): String { if (elementType is PrimitiveType) { return elementType.toKotlin() + "Array" + isNullableStr()