DanilaFe/Abacus
1
0
Fork 0
mirror of https://github.com/DanilaFe/abacus synced 2024-12-22 07:20:09 -08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into context

Browse Source
This commit is contained in:
Danila Fedorin 2017-09-11 19:32:42 -07:00
commit 00f8475044
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fx/src/main/kotlin/org/nwapw/abacus/fx/ExtendedConfiguration.kt
View File

@ -45,7 +45,9 @@ class ExtendedConfiguration(var computationDelay: Double = 0.0,
* @param tomlFile the file from disk to load. * @param tomlFile the file from disk to load.
*/ */
constructor(tomlFile: File) : this() { constructor(tomlFile: File) : this() {
copyFrom(Toml(DEFAULT_TOML_READER).read(tomlFile).to(ExtendedConfiguration::class.java)) val toml = Toml(DEFAULT_TOML_READER)
if(tomlFile.exists()) toml.read(tomlFile)
copyFrom(toml.to(ExtendedConfiguration::class.java))
} }
/** /**