1.1 --- a/boot/src/main/java/org/apidesign/html/boot/spi/Fn.java Wed Jun 19 13:01:04 2013 +0200
1.2 +++ b/boot/src/main/java/org/apidesign/html/boot/spi/Fn.java Wed Jun 19 13:02:13 2013 +0200
1.3 @@ -22,19 +22,13 @@
1.4
1.5 import java.net.URL;
1.6 import java.util.Collection;
1.7 -import org.apidesign.html.boot.impl.FnUtils;
1.8
1.9 /**
1.10 *
1.11 * @author Jaroslav Tulach <jaroslav.tulach@apidesign.org>
1.12 */
1.13 public abstract class Fn {
1.14 - public static ClassLoader newLoader(Finder f, Definer d, ClassLoader parent) {
1.15 - return FnUtils.newLoader(f, d, parent);
1.16 - }
1.17 -
1.18 public abstract Object invoke(Object thiz, Object... args) throws Exception;
1.19 -
1.20
1.21 public interface Definer {
1.22 Fn defineFn(String code, String... names);
2.1 --- a/boot/src/test/java/org/apidesign/html/boot/spi/FnTest.java Wed Jun 19 13:01:04 2013 +0200
2.2 +++ b/boot/src/test/java/org/apidesign/html/boot/spi/FnTest.java Wed Jun 19 13:02:13 2013 +0200
2.3 @@ -33,6 +33,7 @@
2.4 import javax.script.ScriptEngine;
2.5 import javax.script.ScriptEngineManager;
2.6 import javax.script.ScriptException;
2.7 +import org.apidesign.html.boot.impl.FnUtils;
2.8 import org.apidesign.html.boot.impl.JsClassLoaderBase;
2.9 import org.apidesign.html.boot.impl.JsClassLoaderTest;
2.10 import org.apidesign.html.boot.impl.JsMethods;
2.11 @@ -100,7 +101,7 @@
2.12
2.13 }
2.14 Impl impl = new Impl();
2.15 - ClassLoader loader = Fn.newLoader(impl, impl, parent);
2.16 + ClassLoader loader = FnUtils.newLoader(impl, impl, parent);
2.17
2.18
2.19 methodClass = loader.loadClass(JsMethods.class.getName());