ソースを参照

Make state mutation funs internal

tags/v0.2.1
Chris Smith 5年前
コミット
9cc7b08ee3

+ 3
- 3
src/main/kotlin/com/dmdirc/ktirc/model/CaseInsensitiveSet.kt ファイルの表示

12
 
12
 
13
     private val items = HashSet<String>()
13
     private val items = HashSet<String>()
14
 
14
 
15
-    operator fun plusAssign(item: String) {
15
+    internal operator fun plusAssign(item: String) {
16
         if (!contains(item)) {
16
         if (!contains(item)) {
17
             items += item
17
             items += item
18
         }
18
         }
19
     }
19
     }
20
 
20
 
21
-    operator fun minusAssign(item: String) {
21
+    internal operator fun minusAssign(item: String) {
22
         items.removeIf { caseMappingProvider().areEquivalent(it, item) }
22
         items.removeIf { caseMappingProvider().areEquivalent(it, item) }
23
     }
23
     }
24
 
24
 
25
     operator fun contains(item: String) = items.any { caseMappingProvider().areEquivalent(it, item) }
25
     operator fun contains(item: String) = items.any { caseMappingProvider().areEquivalent(it, item) }
26
 
26
 
27
-    override operator fun iterator() = items.iterator()
27
+    override operator fun iterator() = items.iterator().iterator()
28
 
28
 
29
     fun isEmpty() = items.isEmpty()
29
     fun isEmpty() = items.isEmpty()
30
 
30
 

+ 5
- 5
src/main/kotlin/com/dmdirc/ktirc/model/Maps.kt ファイルの表示

8
 
8
 
9
     operator fun get(name: String) = values.find { caseMappingProvider().areEquivalent(nameOf(it), name) }
9
     operator fun get(name: String) = values.find { caseMappingProvider().areEquivalent(nameOf(it), name) }
10
 
10
 
11
-    operator fun plusAssign(value: T) {
11
+    internal operator fun plusAssign(value: T) {
12
         require(get(nameOf(value)) == null) { "Value already registered: ${nameOf(value)}"}
12
         require(get(nameOf(value)) == null) { "Value already registered: ${nameOf(value)}"}
13
         values.add(value)
13
         values.add(value)
14
     }
14
     }
15
 
15
 
16
-    operator fun minusAssign(name: String) {
16
+    internal operator fun minusAssign(name: String) {
17
         values.removeIf { caseMappingProvider().areEquivalent(nameOf(it), name) }
17
         values.removeIf { caseMappingProvider().areEquivalent(nameOf(it), name) }
18
     }
18
     }
19
 
19
 
20
     operator fun contains(name: String) = get(name) != null
20
     operator fun contains(name: String) = get(name) != null
21
 
21
 
22
-    override fun iterator() = values.iterator()
22
+    override fun iterator() = values.iterator().iterator()
23
 
23
 
24
-    fun clear() = values.clear()
24
+    internal fun clear() = values.clear()
25
 
25
 
26
-    fun removeIf(predicate: (T) -> Boolean) = values.removeIf(predicate)
26
+    internal fun removeIf(predicate: (T) -> Boolean) = values.removeIf(predicate)
27
 
27
 
28
 }
28
 }
29
 
29
 

+ 3
- 3
src/main/kotlin/com/dmdirc/ktirc/model/ServerState.kt ファイルの表示

18
     @Suppress("UNCHECKED_CAST")
18
     @Suppress("UNCHECKED_CAST")
19
     operator fun <T : Any> get(feature: ServerFeature<T>) = features.getOrDefault(feature, feature.default) as? T? ?: feature.default
19
     operator fun <T : Any> get(feature: ServerFeature<T>) = features.getOrDefault(feature, feature.default) as? T? ?: feature.default
20
 
20
 
21
-    operator fun set(feature: ServerFeature<*>, value: Any) {
21
+    internal operator fun set(feature: ServerFeature<*>, value: Any) {
22
         require(feature.type.isInstance(value))
22
         require(feature.type.isInstance(value))
23
         features[feature] = value
23
         features[feature] = value
24
     }
24
     }
25
 
25
 
26
-    fun setAll(featureMap: ServerFeatureMap) = featureMap.features.forEach { feature, value -> features[feature] = value }
27
-    fun reset(feature: ServerFeature<*>) = features.put(feature, null)
26
+    internal fun setAll(featureMap: ServerFeatureMap) = featureMap.features.forEach { feature, value -> features[feature] = value }
27
+    internal fun reset(feature: ServerFeature<*>) = features.put(feature, null)
28
 
28
 
29
 }
29
 }
30
 
30
 

+ 8
- 8
src/main/kotlin/com/dmdirc/ktirc/model/UserState.kt ファイルの表示

9
     operator fun get(nickname: String) = users[nickname]
9
     operator fun get(nickname: String) = users[nickname]
10
     operator fun get(user: User) = users[user.nickname]
10
     operator fun get(user: User) = users[user.nickname]
11
 
11
 
12
-    operator fun plusAssign(details: User) { users += KnownUser(caseMappingProvider, details) }
13
-    operator fun minusAssign(details: User) { users -= details.nickname }
12
+    internal operator fun plusAssign(details: User) { users += KnownUser(caseMappingProvider, details) }
13
+    internal operator fun minusAssign(details: User) { users -= details.nickname }
14
 
14
 
15
-    override operator fun iterator() = users.iterator()
15
+    override operator fun iterator() = users.iterator().iterator()
16
 
16
 
17
-    fun removeIf(predicate: (KnownUser) -> Boolean) = users.removeIf(predicate)
17
+    internal fun removeIf(predicate: (KnownUser) -> Boolean) = users.removeIf(predicate)
18
 
18
 
19
-    fun update(user: User, oldNick: String = user.nickname) {
19
+    internal fun update(user: User, oldNick: String = user.nickname) {
20
         users[oldNick]?.details?.updateFrom(user)
20
         users[oldNick]?.details?.updateFrom(user)
21
     }
21
     }
22
 
22
 
23
-    fun addToChannel(user: User, channel: String) {
23
+    internal fun addToChannel(user: User, channel: String) {
24
         users[user.nickname]?.let {
24
         users[user.nickname]?.let {
25
             it += channel
25
             it += channel
26
         } ?: run {
26
         } ?: run {
34
 
34
 
35
     val channels = CaseInsensitiveSet(caseMappingProvider)
35
     val channels = CaseInsensitiveSet(caseMappingProvider)
36
 
36
 
37
-    operator fun plusAssign(channel: String) { channels += channel }
38
-    operator fun minusAssign(channel: String) { channels -= channel }
37
+    internal operator fun plusAssign(channel: String) { channels += channel }
38
+    internal operator fun minusAssign(channel: String) { channels -= channel }
39
     operator fun contains(channel: String) = channel in channels
39
     operator fun contains(channel: String) = channel in channels
40
 
40
 
41
 }
41
 }

読み込み中…
キャンセル
保存