Refactor BaseConfig.reload()

This commit is contained in:
DaMachinator 2018-02-14 12:18:57 -05:00
parent 7b20616e0b
commit cf2e514843
5 changed files with 17 additions and 1 deletions

View File

@ -23,4 +23,8 @@ class MatterLinkConfig(file: File) : BaseConfig(file) {
cfg = this cfg = this
} }
override fun reload(file: File) {
MatterLinkConfig(file)
}
} }

View File

@ -23,4 +23,8 @@ class MatterLinkConfig(file: File) : BaseConfig(file) {
cfg = this cfg = this
} }
override fun reload(file: File) {
MatterLinkConfig(file)
}
} }

View File

@ -21,4 +21,8 @@ class MatterLinkConfig(file: File) : BaseConfig(file) {
if (config.hasChanged()) config.save() if (config.hasChanged()) config.save()
cfg = this cfg = this
} }
override fun reload(file: File) {
MatterLinkConfig(file)
}
} }

View File

@ -2,6 +2,7 @@ package matterlink.command
import matterlink.bridge.MessageHandler import matterlink.bridge.MessageHandler
import matterlink.config.BaseConfig import matterlink.config.BaseConfig
import matterlink.config.cfg
import matterlink.instance import matterlink.instance
object CommandCore { object CommandCore {
@ -23,7 +24,7 @@ object CommandCore {
} }
"reload" -> { "reload" -> {
if (MessageHandler.connected) instance.disconnect() if (MessageHandler.connected) instance.disconnect()
BaseConfig.reload() cfg!!.reload(cfg!!.file)
if (!MessageHandler.connected) instance.connect() if (!MessageHandler.connected) instance.connect()
"Bridge config reloaded!" "Bridge config reloaded!"
} }

View File

@ -14,6 +14,7 @@ abstract class BaseConfig(val file : File) {
private val CATEGORY_COMMAND = "command" private val CATEGORY_COMMAND = "command"
private val CATEGORY_DEATH = "death" private val CATEGORY_DEATH = "death"
@Deprecated("Use BaseConfig.loadConfig(file : File) instead")
fun reload() { fun reload() {
cfg = cfg!!.javaClass.getConstructor(cfg!!.file.javaClass).newInstance(cfg!!.file) cfg = cfg!!.javaClass.getConstructor(cfg!!.file.javaClass).newInstance(cfg!!.file)
} }
@ -257,4 +258,6 @@ abstract class BaseConfig(val file : File) {
} }
) )
} }
abstract fun reload(file : File)
} }