kunfei преди 3 години
родител
ревизия
1bd21a3338
променени са 2 файла, в които са добавени 6 реда и са изтрити 5 реда
  1. 1 0
      rhino/src/main/java/com/script/rhino/InterfaceImplementor.kt
  2. 5 5
      rhino/src/main/java/com/script/rhino/JSAdapter.kt

+ 1 - 0
rhino/src/main/java/com/script/rhino/InterfaceImplementor.kt

@@ -40,6 +40,7 @@ import java.security.PrivilegedExceptionAction
  * @author Mike Grogan
  * @since 1.6
  */
+@Suppress("UNUSED_PARAMETER")
 open class InterfaceImplementor(private val engine: Invocable) {
     @Throws(ScriptException::class)
     fun <T> getInterface(thiz: Any?, iface: Class<T>?): T? {

+ 5 - 5
rhino/src/main/java/com/script/rhino/JSAdapter.kt

@@ -69,7 +69,7 @@ import org.mozilla.javascript.Function
  * @since 1.6
  */
 @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 parent: Scriptable? = null
     private var isPrototype = false
@@ -249,7 +249,7 @@ class JSAdapter private constructor(val adaptee: Scriptable) : Scriptable, Funct
         val tmp: Scriptable?
         return if (isPrototype) {
             tmp = ScriptableObject.getTopLevelScope(scope)
-            if (args.size > 0) {
+            if (args.isNotEmpty()) {
                 JSAdapter(Context.toObject(args[0], tmp))
             } else {
                 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? {
         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 {
@@ -279,8 +279,8 @@ class JSAdapter private constructor(val adaptee: Scriptable) : Scriptable, Funct
         val scope = func.parentScope
         return try {
             func.call(cx, scope, thisObj, args)
-        } catch (var7: RhinoException) {
-            throw Context.reportRuntimeError(var7.message)
+        } catch (re: RhinoException) {
+            throw Context.reportRuntimeError(re.message)
         }
     }