DBot/kommons
DBot/kommons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename interfaces (fix typo)

Browse Source
This commit is contained in:
DBotThePony 2024-02-03 21:01:52 +07:00
parent e7cbe596a2
commit 79f050e662
Signed by: DBot
GPG Key ID: DCC23B5715498507
8 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -4,7 +4,7 @@ kotlin.code.style=official
specifyKotlinAsDependency=false specifyKotlinAsDependency=false
projectGroup=ru.dbotthepony.kommons projectGroup=ru.dbotthepony.kommons
projectVersion=1.7.3 projectVersion=1.7.4
guavaDepVersion=33.0.0 guavaDepVersion=33.0.0
gsonDepVersion=2.8.9 gsonDepVersion=2.8.9

4
src/main/kotlin/ru/dbotthepony/kommons/event/IDoubleSubcripable.kt → src/main/kotlin/ru/dbotthepony/kommons/event/IDoubleSubcriptable.kt
View File

@ -3,7 +3,7 @@ package ru.dbotthepony.kommons.event
import java.util.function.Consumer import java.util.function.Consumer
import java.util.function.DoubleConsumer import java.util.function.DoubleConsumer
interface IDoubleSubcripable : ISubscriptable<Double> { interface IDoubleSubcriptable : ISubscriptable<Double> {
@Deprecated("Use type specific listener") @Deprecated("Use type specific listener")
override fun addListener(listener: Consumer<Double>): ISubscriptable.L { override fun addListener(listener: Consumer<Double>): ISubscriptable.L {
return addListener(DoubleConsumer { listener.accept(it) }) return addListener(DoubleConsumer { listener.accept(it) })
@ -11,7 +11,7 @@ interface IDoubleSubcripable : ISubscriptable<Double> {
fun addListener(listener: DoubleConsumer): ISubscriptable.L fun addListener(listener: DoubleConsumer): ISubscriptable.L
class Impl : IDoubleSubcripable, Consumer<Double>, DoubleConsumer { class Impl : IDoubleSubcriptable, Consumer<Double>, DoubleConsumer {
private inner class L(val callback: DoubleConsumer) : ISubscriptable.L { private inner class L(val callback: DoubleConsumer) : ISubscriptable.L {
private var isRemoved = false private var isRemoved = false

4
src/main/kotlin/ru/dbotthepony/kommons/event/IFloatSubcripable.kt → src/main/kotlin/ru/dbotthepony/kommons/event/IFloatSubcriptable.kt
View File

@ -3,7 +3,7 @@ package ru.dbotthepony.kommons.event
import it.unimi.dsi.fastutil.floats.FloatConsumer import it.unimi.dsi.fastutil.floats.FloatConsumer
import java.util.function.Consumer import java.util.function.Consumer
interface IFloatSubcripable : ISubscriptable<Float> { interface IFloatSubcriptable : ISubscriptable<Float> {
@Deprecated("Use type specific listener") @Deprecated("Use type specific listener")
override fun addListener(listener: Consumer<Float>): ISubscriptable.L { override fun addListener(listener: Consumer<Float>): ISubscriptable.L {
return addListener(listener::accept) return addListener(listener::accept)
@ -11,7 +11,7 @@ interface IFloatSubcripable : ISubscriptable<Float> {
fun addListener(listener: FloatConsumer): ISubscriptable.L fun addListener(listener: FloatConsumer): ISubscriptable.L
class Impl : IFloatSubcripable, Consumer<Float>, FloatConsumer { class Impl : IFloatSubcriptable, Consumer<Float>, FloatConsumer {
private inner class L(val callback: FloatConsumer) : ISubscriptable.L { private inner class L(val callback: FloatConsumer) : ISubscriptable.L {
private var isRemoved = false private var isRemoved = false

4
src/main/kotlin/ru/dbotthepony/kommons/event/IIntSubcripable.kt → src/main/kotlin/ru/dbotthepony/kommons/event/IIntSubcriptable.kt
View File

@ -3,7 +3,7 @@ package ru.dbotthepony.kommons.event
import java.util.function.Consumer import java.util.function.Consumer
import java.util.function.IntConsumer import java.util.function.IntConsumer
interface IIntSubcripable : ISubscriptable<Int> { interface IIntSubcriptable : ISubscriptable<Int> {
@Deprecated("Use type specific listener") @Deprecated("Use type specific listener")
override fun addListener(listener: Consumer<Int>): ISubscriptable.L { override fun addListener(listener: Consumer<Int>): ISubscriptable.L {
return addListener(IntConsumer { listener.accept(it) }) return addListener(IntConsumer { listener.accept(it) })
@ -11,7 +11,7 @@ interface IIntSubcripable : ISubscriptable<Int> {
fun addListener(listener: IntConsumer): ISubscriptable.L fun addListener(listener: IntConsumer): ISubscriptable.L
class Impl : IIntSubcripable, Consumer<Int>, IntConsumer { class Impl : IIntSubcriptable, Consumer<Int>, IntConsumer {
private inner class L(val callback: IntConsumer) : ISubscriptable.L { private inner class L(val callback: IntConsumer) : ISubscriptable.L {
private var isRemoved = false private var isRemoved = false

4
src/main/kotlin/ru/dbotthepony/kommons/event/ILongSubcripable.kt → src/main/kotlin/ru/dbotthepony/kommons/event/ILongSubcriptable.kt
View File

@ -3,7 +3,7 @@ package ru.dbotthepony.kommons.event
import java.util.function.Consumer import java.util.function.Consumer
import java.util.function.LongConsumer import java.util.function.LongConsumer
interface ILongSubcripable : ISubscriptable<Long> { interface ILongSubcriptable : ISubscriptable<Long> {
@Deprecated("Use type specific listener") @Deprecated("Use type specific listener")
override fun addListener(listener: Consumer<Long>): ISubscriptable.L { override fun addListener(listener: Consumer<Long>): ISubscriptable.L {
return addListener(LongConsumer { listener.accept(it) }) return addListener(LongConsumer { listener.accept(it) })
@ -11,7 +11,7 @@ interface ILongSubcripable : ISubscriptable<Long> {
fun addListener(listener: LongConsumer): ISubscriptable.L fun addListener(listener: LongConsumer): ISubscriptable.L
class Impl : ILongSubcripable, Consumer<Long>, LongConsumer { class Impl : ILongSubcriptable, Consumer<Long>, LongConsumer {
private inner class L(val callback: LongConsumer) : ISubscriptable.L { private inner class L(val callback: LongConsumer) : ISubscriptable.L {
private var isRemoved = false private var isRemoved = false

4
src/main/kotlin/ru/dbotthepony/kommons/event/IUnitSubscripable.kt → src/main/kotlin/ru/dbotthepony/kommons/event/IUnitSubscriptable.kt
View File

@ -2,14 +2,14 @@ package ru.dbotthepony.kommons.event
import java.util.function.Consumer import java.util.function.Consumer
interface IUnitSubscripable : ISubscriptable<Unit> { interface IUnitSubscriptable : ISubscriptable<Unit> {
fun addListener(listener: Runnable): ISubscriptable.L fun addListener(listener: Runnable): ISubscriptable.L
override fun addListener(listener: Consumer<Unit>): ISubscriptable.L { override fun addListener(listener: Consumer<Unit>): ISubscriptable.L {
return addListener(Runnable { listener.accept(Unit) }) return addListener(Runnable { listener.accept(Unit) })
} }
class Impl : IUnitSubscripable, Runnable { class Impl : IUnitSubscriptable, Runnable {
private inner class L(val callback: Runnable) : ISubscriptable.L { private inner class L(val callback: Runnable) : ISubscriptable.L {
private var isRemoved = false private var isRemoved = false

25
src/main/kotlin/ru/dbotthepony/kommons/networking/FieldSynchronizer.kt
View File

@ -10,10 +10,10 @@ import it.unimi.dsi.fastutil.objects.ReferenceArraySet
import ru.dbotthepony.kommons.collect.ProxiedMap import ru.dbotthepony.kommons.collect.ProxiedMap
import ru.dbotthepony.kommons.collect.forValidRefs import ru.dbotthepony.kommons.collect.forValidRefs
import ru.dbotthepony.kommons.event.IBooleanSubscriptable import ru.dbotthepony.kommons.event.IBooleanSubscriptable
import ru.dbotthepony.kommons.event.IDoubleSubcripable import ru.dbotthepony.kommons.event.IDoubleSubcriptable
import ru.dbotthepony.kommons.event.IFloatSubcripable import ru.dbotthepony.kommons.event.IFloatSubcriptable
import ru.dbotthepony.kommons.event.IIntSubcripable import ru.dbotthepony.kommons.event.IIntSubcriptable
import ru.dbotthepony.kommons.event.ILongSubcripable import ru.dbotthepony.kommons.event.ILongSubcriptable
import ru.dbotthepony.kommons.event.ISubscriptable import ru.dbotthepony.kommons.event.ISubscriptable
import ru.dbotthepony.kommons.io.BigDecimalValueCodec import ru.dbotthepony.kommons.io.BigDecimalValueCodec
import ru.dbotthepony.kommons.io.BinaryStringCodec import ru.dbotthepony.kommons.io.BinaryStringCodec
@ -49,7 +49,6 @@ import java.util.function.IntSupplier
import java.util.function.LongConsumer import java.util.function.LongConsumer
import java.util.function.LongSupplier import java.util.function.LongSupplier
import java.util.function.Supplier import java.util.function.Supplier
import kotlin.collections.LinkedHashSet
import kotlin.reflect.KMutableProperty0 import kotlin.reflect.KMutableProperty0
import kotlin.reflect.KProperty import kotlin.reflect.KProperty
import kotlin.reflect.KProperty0 import kotlin.reflect.KProperty0
@ -620,7 +619,7 @@ class FieldSynchronizer(private val callback: Runnable, private val alwaysCallCa
* Type specific field, storing primitive [Float] directly * Type specific field, storing primitive [Float] directly
*/ */
inner class FloatField(field: Float, private val getter: FloatFieldGetter? = null, private val setter: FloatFieldSetter? = null) : PrimitiveField<Float>(), IMutableFloatField { inner class FloatField(field: Float, private val getter: FloatFieldGetter? = null, private val setter: FloatFieldSetter? = null) : PrimitiveField<Float>(), IMutableFloatField {
private val subs = IFloatSubcripable.Impl() private val subs = IFloatSubcriptable.Impl()
override fun addListener(listener: FloatConsumer): ISubscriptable.L { override fun addListener(listener: FloatConsumer): ISubscriptable.L {
return subs.addListener(listener) return subs.addListener(listener)
@ -701,7 +700,7 @@ class FieldSynchronizer(private val callback: Runnable, private val alwaysCallCa
* Type specific field, storing primitive [Double] directly * Type specific field, storing primitive [Double] directly
*/ */
inner class DoubleField(field: Double, private val getter: DoubleFieldGetter? = null, private val setter: DoubleFieldSetter? = null) : PrimitiveField<Double>(), IMutableDoubleField { inner class DoubleField(field: Double, private val getter: DoubleFieldGetter? = null, private val setter: DoubleFieldSetter? = null) : PrimitiveField<Double>(), IMutableDoubleField {
private val subs = IDoubleSubcripable.Impl() private val subs = IDoubleSubcriptable.Impl()
override fun addListener(listener: DoubleConsumer): ISubscriptable.L { override fun addListener(listener: DoubleConsumer): ISubscriptable.L {
return subs.addListener(listener) return subs.addListener(listener)
@ -779,7 +778,7 @@ class FieldSynchronizer(private val callback: Runnable, private val alwaysCallCa
} }
abstract inner class AbstractIntField(field: Int, private val getter: IntFieldGetter? = null, protected val setter: IntFieldSetter? = null) : PrimitiveField<Int>(), IMutableIntField { abstract inner class AbstractIntField(field: Int, private val getter: IntFieldGetter? = null, protected val setter: IntFieldSetter? = null) : PrimitiveField<Int>(), IMutableIntField {
private val subs = IIntSubcripable.Impl() private val subs = IIntSubcriptable.Impl()
override fun addListener(listener: IntConsumer): ISubscriptable.L { override fun addListener(listener: IntConsumer): ISubscriptable.L {
return subs.addListener(listener) return subs.addListener(listener)
@ -888,7 +887,7 @@ class FieldSynchronizer(private val callback: Runnable, private val alwaysCallCa
* Type specific field, storing primitive [Long] directly * Type specific field, storing primitive [Long] directly
*/ */
abstract inner class AbstractLongField(field: Long, private val getter: LongFieldGetter? = null, protected val setter: LongFieldSetter? = null) : PrimitiveField<Long>(), IMutableLongField { abstract inner class AbstractLongField(field: Long, private val getter: LongFieldGetter? = null, protected val setter: LongFieldSetter? = null) : PrimitiveField<Long>(), IMutableLongField {
private val subs = ILongSubcripable.Impl() private val subs = ILongSubcriptable.Impl()
override fun addListener(listener: LongConsumer): ISubscriptable.L { override fun addListener(listener: LongConsumer): ISubscriptable.L {
return subs.addListener(listener) return subs.addListener(listener)
@ -1149,7 +1148,7 @@ class FieldSynchronizer(private val callback: Runnable, private val alwaysCallCa
private var isRemoteSet = false private var isRemoteSet = false
private var clientValue: Float = 0f private var clientValue: Float = 0f
private var isClientValue = false private var isClientValue = false
private val subs = IFloatSubcripable.Impl() private val subs = IFloatSubcriptable.Impl()
init { init {
if (observer != null) { if (observer != null) {
@ -1231,7 +1230,7 @@ class FieldSynchronizer(private val callback: Runnable, private val alwaysCallCa
private var isRemoteSet = false private var isRemoteSet = false
private var clientValue: Double = 0.0 private var clientValue: Double = 0.0
private var isClientValue = false private var isClientValue = false
private val subs = IDoubleSubcripable.Impl() private val subs = IDoubleSubcriptable.Impl()
init { init {
if (observer != null) { if (observer != null) {
@ -1316,7 +1315,7 @@ class FieldSynchronizer(private val callback: Runnable, private val alwaysCallCa
} }
protected var isClientValue = false protected var isClientValue = false
private val subs = IIntSubcripable.Impl() private val subs = IIntSubcriptable.Impl()
init { init {
if (observer != null) { if (observer != null) {
@ -1423,7 +1422,7 @@ class FieldSynchronizer(private val callback: Runnable, private val alwaysCallCa
} }
protected var isClientValue = false protected var isClientValue = false
private val subs = ILongSubcripable.Impl() private val subs = ILongSubcriptable.Impl()
init { init {
if (observer != null) { if (observer != null) {

16
src/main/kotlin/ru/dbotthepony/kommons/networking/Fields.kt
View File

@ -1,10 +1,10 @@
package ru.dbotthepony.kommons.networking package ru.dbotthepony.kommons.networking
import ru.dbotthepony.kommons.event.IBooleanSubscriptable import ru.dbotthepony.kommons.event.IBooleanSubscriptable
import ru.dbotthepony.kommons.event.IDoubleSubcripable import ru.dbotthepony.kommons.event.IDoubleSubcriptable
import ru.dbotthepony.kommons.event.IFloatSubcripable import ru.dbotthepony.kommons.event.IFloatSubcriptable
import ru.dbotthepony.kommons.event.IIntSubcripable import ru.dbotthepony.kommons.event.IIntSubcriptable
import ru.dbotthepony.kommons.event.ILongSubcripable import ru.dbotthepony.kommons.event.ILongSubcriptable
import ru.dbotthepony.kommons.event.ISubscriptable import ru.dbotthepony.kommons.event.ISubscriptable
import ru.dbotthepony.kommons.util.FloatSupplier import ru.dbotthepony.kommons.util.FloatSupplier
import java.io.DataInputStream import java.io.DataInputStream
@ -46,7 +46,7 @@ interface IFloatProperty {
operator fun getValue(thisRef: Any?, property: KProperty<*>): Float operator fun getValue(thisRef: Any?, property: KProperty<*>): Float
} }
sealed interface IFloatField : IField<Float>, FloatSupplier, IFloatSubcripable { sealed interface IFloatField : IField<Float>, FloatSupplier, IFloatSubcriptable {
val float: Float val float: Float
val property: IFloatProperty val property: IFloatProperty
@ -72,7 +72,7 @@ interface IDoubleProperty {
operator fun getValue(thisRef: Any?, property: KProperty<*>): Double operator fun getValue(thisRef: Any?, property: KProperty<*>): Double
} }
sealed interface IDoubleField : IField<Double>, DoubleSupplier, IDoubleSubcripable { sealed interface IDoubleField : IField<Double>, DoubleSupplier, IDoubleSubcriptable {
val double: Double val double: Double
val property: IDoubleProperty val property: IDoubleProperty
@ -98,7 +98,7 @@ interface IIntProperty {
operator fun getValue(thisRef: Any?, property: KProperty<*>): Int operator fun getValue(thisRef: Any?, property: KProperty<*>): Int
} }
sealed interface IIntField : IField<Int>, IntSupplier, IIntSubcripable { sealed interface IIntField : IField<Int>, IntSupplier, IIntSubcriptable {
val int: Int val int: Int
val property: IIntProperty val property: IIntProperty
@ -124,7 +124,7 @@ interface ILongProperty {
operator fun getValue(thisRef: Any?, property: KProperty<*>): Long operator fun getValue(thisRef: Any?, property: KProperty<*>): Long
} }
sealed interface ILongField : IField<Long>, LongSupplier, ILongSubcripable { sealed interface ILongField : IField<Long>, LongSupplier, ILongSubcriptable {
val long: Long val long: Long
val property: ILongProperty val property: ILongProperty