From 497c903800f9a86d7c235c42ecbe78cdc6cd008e Mon Sep 17 00:00:00 2001 From: Ricardo Matias Date: Mon, 24 Aug 2020 19:29:27 +0100 Subject: [PATCH] [orx-olive] add resources watcher to oliveProgram --- orx-olive/src/main/kotlin/OliveProgram.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/orx-olive/src/main/kotlin/OliveProgram.kt b/orx-olive/src/main/kotlin/OliveProgram.kt index b4caa3ae..1a2d5972 100644 --- a/orx-olive/src/main/kotlin/OliveProgram.kt +++ b/orx-olive/src/main/kotlin/OliveProgram.kt @@ -7,8 +7,8 @@ import java.nio.file.Files import java.nio.file.Paths import kotlin.streams.toList -open class OliveProgram(private val sourceLocation: String, private val scriptHost: OliveScriptHost) : Program() { - val olive = extend(Olive(scriptMode = ScriptMode.OLIVE_PROGRAM)) { +open class OliveProgram(private val sourceLocation: String, private val scriptHost: OliveScriptHost, resources: Resources?) : Program() { + val olive = extend(Olive(scriptMode = ScriptMode.OLIVE_PROGRAM, resources = resources)) { script = sourceLocation scriptHost = this@OliveProgram.scriptHost } @@ -20,7 +20,7 @@ fun stackRootClassName(thread: Thread = Thread.currentThread(), sanitize: Boolea return if (sanitize) rootClass.replace(Regex("Kt$"), "") else rootClass } -fun ApplicationBuilder.oliveProgram(scriptHost: OliveScriptHost = OliveScriptHost.JSR223_REUSE, init: OliveProgram.() -> Unit): OliveProgram { +fun ApplicationBuilder.oliveProgram(scriptHost: OliveScriptHost = OliveScriptHost.JSR223_REUSE, resources: Resources? = null, init: OliveProgram.() -> Unit): OliveProgram { val rootClassName = stackRootClassName(sanitize = true).split(".").last() var sourceLocation = "src/main/kotlin/$rootClassName.kt" @@ -34,7 +34,7 @@ fun ApplicationBuilder.oliveProgram(scriptHost: OliveScriptHost = OliveScriptHos error("multiple source candidates found: $otherCandidates") } } - program = object : OliveProgram(sourceLocation, scriptHost) { + program = object : OliveProgram(sourceLocation, scriptHost, resources) { override fun setup() { super.setup() init()