1.1 --- a/boot/src/test/java/org/netbeans/html/boot/impl/JsClassLoaderTest.java	Tue Mar 31 15:40:22 2015 +0200
     1.2 +++ b/boot/src/test/java/org/netbeans/html/boot/impl/JsClassLoaderTest.java	Fri Jan 15 11:40:28 2016 +0100
     1.3 @@ -44,7 +44,6 @@
     1.4  
     1.5  import java.io.Closeable;
     1.6  import java.io.Reader;
     1.7 -import org.netbeans.html.boot.spi.Fn;
     1.8  import java.net.URL;
     1.9  import java.net.URLClassLoader;
    1.10  import java.util.ArrayList;
    1.11 @@ -56,6 +55,7 @@
    1.12  import javax.script.ScriptEngine;
    1.13  import javax.script.ScriptEngineManager;
    1.14  import javax.script.ScriptException;
    1.15 +import org.netbeans.html.boot.spi.Fn;
    1.16  import org.testng.annotations.AfterClass;
    1.17  import org.testng.annotations.BeforeClass;
    1.18  import org.testng.annotations.BeforeMethod;
    1.19 @@ -101,16 +101,16 @@
    1.20                  sb.append("};");
    1.21                  sb.append("})()");
    1.22                  try {
    1.23 -                    final Object val = eng.eval(sb.toString());
    1.24 +                    final java.lang.Object val = eng.eval(sb.toString());
    1.25                      return new Fn(this) {
    1.26                          @Override
    1.27 -                        public Object invoke(Object thiz, Object... args) throws Exception {
    1.28 -                            List<Object> all = new ArrayList<Object>(args.length + 1);
    1.29 +                        public java.lang.Object invoke(java.lang.Object thiz, java.lang.Object... args) throws Exception {
    1.30 +                            List<java.lang.Object> all = new ArrayList<java.lang.Object>(args.length + 1);
    1.31                              all.add(thiz == null ? val : thiz);
    1.32                              all.addAll(Arrays.asList(args));
    1.33                              Invocable inv = (Invocable)eng;
    1.34                              try {
    1.35 -                                Object ret = inv.invokeMethod(val, "call", all.toArray());
    1.36 +                                java.lang.Object ret = inv.invokeMethod(val, "call", all.toArray());
    1.37                                  return val.equals(ret) ? null : ret;
    1.38                              } catch (Exception ex) {
    1.39                                  throw ex;