yusheng/QieKan-3.0
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 2 Wiki Activity

优化

Browse Source
This commit is contained in:
kunfei
2023-03-20 18:37:01 +08:00
parent b65435cc1d
commit 1bd21a3338
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rhino/src/main/java/com/script/rhino/InterfaceImplementor.kt
+1
View File
@@ -40,6 +40,7 @@ import java.security.PrivilegedExceptionAction
* @author Mike Grogan * @author Mike Grogan
* @since 1.6 * @since 1.6
*/ */
@Suppress("UNUSED_PARAMETER")
open class InterfaceImplementor(private val engine: Invocable) { open class InterfaceImplementor(private val engine: Invocable) {
@Throws(ScriptException::class) @Throws(ScriptException::class)
fun <T> getInterface(thiz: Any?, iface: Class<T>?): T? { fun <T> getInterface(thiz: Any?, iface: Class<T>?): T? {
rhino/src/main/java/com/script/rhino/JSAdapter.kt
+5 -5
View File
@@ -69,7 +69,7 @@ import org.mozilla.javascript.Function
* @since 1.6 * @since 1.6
*/ */
@Suppress("unused", "UNUSED_PARAMETER") @Suppress("unused", "UNUSED_PARAMETER")
class JSAdapter private constructor(val adaptee: Scriptable) : Scriptable, Function { class JSAdapter private constructor(var adaptee: Scriptable) : Scriptable, Function {
private var prototype: Scriptable? = null private var prototype: Scriptable? = null
private var parent: Scriptable? = null private var parent: Scriptable? = null
private var isPrototype = false private var isPrototype = false
@@ -249,7 +249,7 @@ class JSAdapter private constructor(val adaptee: Scriptable) : Scriptable, Funct
val tmp: Scriptable? val tmp: Scriptable?
return if (isPrototype) { return if (isPrototype) {
tmp = ScriptableObject.getTopLevelScope(scope) tmp = ScriptableObject.getTopLevelScope(scope)
if (args.size > 0) { if (args.isNotEmpty()) {
JSAdapter(Context.toObject(args[0], tmp)) JSAdapter(Context.toObject(args[0], tmp))
} else { } else {
throw Context.reportRuntimeError("JSAdapter requires adaptee") throw Context.reportRuntimeError("JSAdapter requires adaptee")
@@ -270,7 +270,7 @@ class JSAdapter private constructor(val adaptee: Scriptable) : Scriptable, Funct
private fun getAdapteeFunction(name: String): Function? { private fun getAdapteeFunction(name: String): Function? {
val o = ScriptableObject.getProperty(adaptee, name) val o = ScriptableObject.getProperty(adaptee, name)
return if (o is Function) o else null return o as? Function
} }
private fun call(func: Function, args: Array<Any?>): Any { private fun call(func: Function, args: Array<Any?>): Any {
@@ -279,8 +279,8 @@ class JSAdapter private constructor(val adaptee: Scriptable) : Scriptable, Funct
val scope = func.parentScope val scope = func.parentScope
return try { return try {
func.call(cx, scope, thisObj, args) func.call(cx, scope, thisObj, args)
} catch (var7: RhinoException) { } catch (re: RhinoException) {
throw Context.reportRuntimeError(var7.message) throw Context.reportRuntimeError(re.message)
} }
} }