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

Java to Kotlin conversion: minor

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-06-03 22:13:17 +04:00
parent 6b11a5b3d9
commit ef8504eb39
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/jet/j2k/ast/Types.kt
+6 -6
View File
@@ -22,8 +22,8 @@ import java.util.ArrayList
fun Type.isPrimitive(): Boolean = this is PrimitiveType fun Type.isPrimitive(): Boolean = this is PrimitiveType
fun Type.isUnit(): Boolean = this == Type.Unit fun Type.isUnit(): Boolean = this == Type.Unit
abstract class MayBeNullableType(nullable: Boolean, val converter: Converter) : Type { abstract class MayBeNullableType(isNullable: Boolean, val converter: Converter) : Type {
override val isNullable: Boolean = !converter.settings.forceNotNullTypes && nullable override val isNullable: Boolean = !converter.settings.forceNotNullTypes && isNullable
} }
trait NotNullType : Type { trait NotNullType : Type {
@@ -56,8 +56,8 @@ trait Type : Element {
override fun hashCode(): Int = toKotlin().hashCode() override fun hashCode(): Int = toKotlin().hashCode()
} }
open class ClassType(val `type`: Identifier, val parameters: List<Element>, nullable: Boolean, open class ClassType(val `type`: Identifier, val parameters: List<Element>, isNullable: Boolean,
converter: Converter) : MayBeNullableType(nullable, converter) { converter: Converter) : MayBeNullableType(isNullable, converter) {
override fun toKotlin(): String { override fun toKotlin(): String {
// TODO change to map() when KT-2051 is fixed // TODO change to map() when KT-2051 is fixed
@@ -78,9 +78,9 @@ open class ClassType(val `type`: Identifier, val parameters: List<Element>, null
class ArrayType( class ArrayType(
val elementType: Type, val elementType: Type,
nullable: Boolean, isNullable: Boolean,
converter: Converter converter: Converter
) : MayBeNullableType(nullable, converter) { ) : MayBeNullableType(isNullable, converter) {
override fun toKotlin(): String { override fun toKotlin(): String {
if (elementType is PrimitiveType) { if (elementType is PrimitiveType) {
return elementType.toKotlin() + "Array" + isNullableStr() return elementType.toKotlin() + "Array" + isNullableStr()