diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 09:06:44 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 09:06:44 +0000 |
commit | ed5640d8b587fbcfed7dd7967f3de04b37a76f26 (patch) | |
tree | 7a5f7c6c9d02226d7471cb3cc8fbbf631b415303 /external/beanshell/beanshell-invoke.patch | |
parent | Initial commit. (diff) | |
download | libreoffice-ed5640d8b587fbcfed7dd7967f3de04b37a76f26.tar.xz libreoffice-ed5640d8b587fbcfed7dd7967f3de04b37a76f26.zip |
Adding upstream version 4:7.4.7.upstream/4%7.4.7upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | external/beanshell/beanshell-invoke.patch | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/external/beanshell/beanshell-invoke.patch b/external/beanshell/beanshell-invoke.patch new file mode 100644 index 000000000..b78f1db61 --- /dev/null +++ b/external/beanshell/beanshell-invoke.patch @@ -0,0 +1,78 @@ +--- old/beanshell/engine/src/bsh/engine/BshScriptEngine.java ++++ new/beanshell/engine/src/bsh/engine/BshScriptEngine.java +@@ -229,6 +229,12 @@ + } + } + ++ public Object invoke( Object thiz, String name, Object... args ) ++ throws ScriptException, NoSuchMethodException ++ { ++ return invokeMethod( thiz, name, args ); ++ } ++ + /** + * Same as invoke(Object, String, Object...) with <code>null</code> as the + * first argument. Used to call top-level procedures defined in scripts. +@@ -249,6 +255,12 @@ + return invokeMethod( getGlobal(), name, args ); + } + ++ public Object invoke( String name, Object... args ) ++ throws ScriptException, NoSuchMethodException ++ { ++ return invokeFunction( name, args ); ++ } ++ + /** + * Returns an implementation of an interface using procedures compiled in the + * interpreter. The methods of the interface may be implemented using the +--- old/beanshell/engine/src/TestBshScriptEngine.java ++++ new/beanshell/engine/src/TestBshScriptEngine.java +@@ -2,11 +2,12 @@ + import java.io.*; + import javax.script.*; + import static javax.script.ScriptContext.*; ++import java.lang.reflect.*; + + public class TestBshScriptEngine + { + public static void main( String [] args ) +- throws ScriptException, NoSuchMethodException, IOException ++ throws ScriptException, NoSuchMethodException, IllegalAccessException, InvocationTargetException, IOException + { + ScriptEngineManager manager = + new ScriptEngineManager( bsh.Interpreter.class.getClassLoader() ); +@@ -39,11 +40,23 @@ + assertTrue( engine.get("bar").equals("gee") ); + assertTrue( engine.eval("bar").equals("gee") ); + ++ // use reflection to pick available method ++ Method invokeMe = null; ++ try { ++ invokeMe = Invocable.class.getMethod( "invokeFunction", String.class, Object[].class ); ++ } catch ( Exception e ) { } ++ if (invokeMe == null) ++ { ++ try { ++ invokeMe = Invocable.class.getMethod( "invoke", String.class, Object[].class ); ++ } catch ( Exception e ) { } ++ } ++ + // install and invoke a method + engine.eval("foo() { return foo+1; }"); + // invoke a method + Invocable invocable = (Invocable) engine; +- int foo = (Integer)invocable.invokeFunction( "foo" ); ++ int foo = (Integer)invokeMe.invoke( invocable, "foo", (Object) new Object[]{} ); + assertTrue( foo == 43 ); + + // get interface +@@ -58,7 +71,7 @@ + engine.eval( + "flag2=false; myObj() { run() { flag2=true; } return this; }"); + assertTrue( (Boolean)engine.get("flag2") == false ); +- Object scriptedObject = invocable.invokeFunction("myObj"); ++ Object scriptedObject = invokeMe.invoke( invocable, "myObj", (Object) new Object[]{} ); + assertTrue( scriptedObject instanceof bsh.This ); + runnable = + (Runnable)invocable.getInterface( scriptedObject, Runnable.class ); |