1.1 --- a/boot/src/test/java/org/netbeans/html/boot/impl/JsMethods.java Sat Apr 11 07:41:04 2015 +0200
1.2 +++ b/boot/src/test/java/org/netbeans/html/boot/impl/JsMethods.java Fri Jan 15 11:40:28 2016 +0100
1.3 @@ -52,10 +52,10 @@
1.4 */
1.5 @JavaScriptResource("jsmethods.js")
1.6 public class JsMethods {
1.7 - private Object value;
1.8 + private java.lang.Object value;
1.9
1.10 @JavaScriptBody(args = {}, body = "return 42;")
1.11 - public static Object fortyTwo() {
1.12 + public static java.lang.Object fortyTwo() {
1.13 return -42;
1.14 }
1.15
1.16 @@ -66,10 +66,10 @@
1.17 public static native int plus(int x);
1.18
1.19 @JavaScriptBody(args = {}, body = "return this;")
1.20 - public static native Object staticThis();
1.21 + public static native java.lang.Object staticThis();
1.22
1.23 @JavaScriptBody(args = {}, body = "return this;")
1.24 - public native Object getThis();
1.25 + public native java.lang.Object getThis();
1.26 @JavaScriptBody(args = {"x"}, body = "return x;")
1.27 public native int plusInst(int x);
1.28
1.29 @@ -110,7 +110,7 @@
1.30 public static native String fromEnum(Enm v);
1.31
1.32 @JavaScriptBody(args = "arr", body = "return arr;")
1.33 - public static native Object[] arr(Object[] arr);
1.34 + public static native java.lang.Object[] arr(java.lang.Object[] arr);
1.35
1.36 @JavaScriptBody(args = { "useA", "useB", "a", "b" }, body = "var l = 0;"
1.37 + "if (useA) l += a;\n"
1.38 @@ -119,11 +119,11 @@
1.39 )
1.40 public static native long chooseLong(boolean useA, boolean useB, long a, long b);
1.41
1.42 - protected void onError(Object o) throws Exception {
1.43 + protected void onError(java.lang.Object o) throws Exception {
1.44 value = o;
1.45 }
1.46
1.47 - Object getError() {
1.48 + java.lang.Object getError() {
1.49 return value;
1.50 }
1.51
1.52 @@ -131,7 +131,7 @@
1.53 "this.@org.netbeans.html.boot.impl.JsMethods::onError(Ljava/lang/Object;)(err);"
1.54 + "return this.@org.netbeans.html.boot.impl.JsMethods::getError()();"
1.55 )
1.56 - public native Object recordError(Object err);
1.57 + public native java.lang.Object recordError(java.lang.Object err);
1.58
1.59 @JavaScriptBody(args = { "x", "y" }, body = "return x + y;")
1.60 public static int plusOrMul(int x, int y) {
1.61 @@ -139,7 +139,7 @@
1.62 }
1.63
1.64 @JavaScriptBody(args = { "x" }, keepAlive = false, body = "throw 'Do not call me!'")
1.65 - public static native int checkAllowGC(Object x);
1.66 + public static native int checkAllowGC(java.lang.Object x);
1.67
1.68 enum Enm {
1.69 A, B;