From e800e8acd6aa0048a796aeb2dec8460b4bb365d3 Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Mon, 28 Nov 2016 15:41:03 +0300 Subject: [PATCH] Use primary constructor in ArrayList. --- .../kotlin/kotlin/collections/ArrayList.kt | 44 ++++--------------- 1 file changed, 9 insertions(+), 35 deletions(-) diff --git a/runtime/src/main/kotlin/kotlin/collections/ArrayList.kt b/runtime/src/main/kotlin/kotlin/collections/ArrayList.kt index 7af2b35c988..1843f805c97 100644 --- a/runtime/src/main/kotlin/kotlin/collections/ArrayList.kt +++ b/runtime/src/main/kotlin/kotlin/collections/ArrayList.kt @@ -1,43 +1,17 @@ package kotlin.collections -class ArrayList : MutableList { +class ArrayList private constructor( + private var array: Array, + private var offset: Int, + private var length: Int, + private val backing: ArrayList? +) : MutableList { - private var array: Array - private var offset: Int - private var length: Int - private val backing: ArrayList? + constructor() : this(10) - private constructor( - array: Array, - offset: Int, - length: Int, - backing: ArrayList?) { - this.array = array - this.offset = offset - this.length = length - this.backing = backing - } + constructor(initialCapacity: Int) : this(arrayOfLateInitElements(initialCapacity), 0, 0, null) - - constructor() { - this.array = arrayOfLateInitElements(10) - this.offset = 0 - this.length = 0 - this.backing = null - } - - constructor(initialCapacity: Int) { - this.array = arrayOfLateInitElements(initialCapacity) - this.offset = 0 - this.length = 0 - this.backing = null - } - - constructor(c: Collection) { - this.array = arrayOfLateInitElements(c.size) - this.offset = 0 - this.length = 0 - this.backing = null + constructor(c: Collection) : this(c.size) { addAll(c) }