From d0b7ddfceb5e19e01c162f5d3d525a6242a18a30 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Sat, 27 Aug 2016 00:49:06 +0300 Subject: [PATCH] Minor cleanup, rename parameters to match supertype names. --- .../src/core/collections/AbstractMap.kt | 18 +++++++++--------- .../src/core/collections/HashMap.kt | 6 +++--- .../src/core/collections/InternalMap.kt | 3 +++ .../src/core/collections/InternalStringMap.kt | 4 ++-- .../src/core/collections/LinkedHashMap.kt | 6 +++--- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/js/js.libraries/src/core/collections/AbstractMap.kt b/js/js.libraries/src/core/collections/AbstractMap.kt index 0da59e83259..e40eac380ef 100644 --- a/js/js.libraries/src/core/collections/AbstractMap.kt +++ b/js/js.libraries/src/core/collections/AbstractMap.kt @@ -32,9 +32,9 @@ abstract class AbstractMap protected constructor() : MutableMap { override val value: V get() = _value - override fun setValue(value: V): V { + override fun setValue(newValue: V): V { val oldValue = this._value - this._value = value + this._value = newValue return oldValue } @@ -107,7 +107,7 @@ abstract class AbstractMap protected constructor() : MutableMap { this@AbstractMap.clear() } - override operator fun contains(key: K): Boolean = containsKey(key) + override operator fun contains(element: K): Boolean = containsKey(element) override operator fun iterator(): MutableIterator { val outerIter = entries.iterator() @@ -118,9 +118,9 @@ abstract class AbstractMap protected constructor() : MutableMap { } } - override fun remove(key: K): Boolean { - if (containsKey(key)) { - this@AbstractMap.remove(key) + override fun remove(element: K): Boolean { + if (containsKey(element)) { + this@AbstractMap.remove(element) return true } return false @@ -134,8 +134,8 @@ abstract class AbstractMap protected constructor() : MutableMap { throw UnsupportedOperationException("Put not supported on this map") } - override fun putAll(map: Map) { - for ((key, value) in map) { + override fun putAll(from: Map) { + for ((key, value) in from) { put(key, value) } } @@ -152,7 +152,7 @@ abstract class AbstractMap protected constructor() : MutableMap { return object : AbstractCollection() { override fun clear() = this@AbstractMap.clear() - override operator fun contains(value: V): Boolean = containsValue(value) + override operator fun contains(element: V): Boolean = containsValue(element) override operator fun iterator(): MutableIterator { val outerIter = entries.iterator() diff --git a/js/js.libraries/src/core/collections/HashMap.kt b/js/js.libraries/src/core/collections/HashMap.kt index 59f3c3f6ff7..605243cf00c 100644 --- a/js/js.libraries/src/core/collections/HashMap.kt +++ b/js/js.libraries/src/core/collections/HashMap.kt @@ -35,9 +35,9 @@ open class HashMap : AbstractMap { override operator fun iterator(): MutableIterator> = internalMap.iterator() - override fun remove(entry: MutableEntry): Boolean { - if (contains(entry)) { - this@HashMap.remove(entry.key) + override fun remove(element: MutableEntry): Boolean { + if (contains(element)) { + this@HashMap.remove(element.key) return true } return false diff --git a/js/js.libraries/src/core/collections/InternalMap.kt b/js/js.libraries/src/core/collections/InternalMap.kt index 607053975aa..bb8cdc01f98 100644 --- a/js/js.libraries/src/core/collections/InternalMap.kt +++ b/js/js.libraries/src/core/collections/InternalMap.kt @@ -16,6 +16,9 @@ package kotlin.collections +/** + * The common interface of [InternalStringMap] and [InternalHashCodeMap]. + */ internal interface InternalMap : MutableIterable> { val equality: EqualityComparator val size: Int diff --git a/js/js.libraries/src/core/collections/InternalStringMap.kt b/js/js.libraries/src/core/collections/InternalStringMap.kt index f3c87f76fa4..d01e26e4c24 100644 --- a/js/js.libraries/src/core/collections/InternalStringMap.kt +++ b/js/js.libraries/src/core/collections/InternalStringMap.kt @@ -70,7 +70,7 @@ internal class InternalStringMap(override val equality: EqualityComparator if (key !is String) return null val value = backingMap[key] if (value !== undefined) { - deleteProperty(backingMap, key!!) + deleteProperty(backingMap, key) size-- // structureChanged(host) return value as V @@ -112,7 +112,7 @@ internal class InternalStringMap(override val equality: EqualityComparator override val key: K get() = key override val value: V get() = this@InternalStringMap[key] as V - override fun setValue(value: V): V = this@InternalStringMap.put(key, value) as V + override fun setValue(newValue: V): V = this@InternalStringMap.put(key, newValue) as V override fun hashCode(): Int = AbstractMap.entryHashCode(this) override fun toString(): String = AbstractMap.entryToString(this) diff --git a/js/js.libraries/src/core/collections/LinkedHashMap.kt b/js/js.libraries/src/core/collections/LinkedHashMap.kt index abb141f7ceb..45d202ba4e4 100644 --- a/js/js.libraries/src/core/collections/LinkedHashMap.kt +++ b/js/js.libraries/src/core/collections/LinkedHashMap.kt @@ -133,9 +133,9 @@ open class LinkedHashMap : HashMap, Map { override operator fun iterator(): MutableIterator> = EntryIterator() - override fun remove(entry: MutableEntry): Boolean { - if (contains(entry)) { - this@LinkedHashMap.remove(entry.key) + override fun remove(element: MutableEntry): Boolean { + if (contains(element)) { + this@LinkedHashMap.remove(element.key) return true } return false