1.1 --- a/launcher/fx/src/test/java/org/apidesign/bck2brwsr/launcher/fximpl/JsClassLoaderTest.java	Mon Jun 17 19:52:10 2013 +0200
     1.2 +++ b/launcher/fx/src/test/java/org/apidesign/bck2brwsr/launcher/fximpl/JsClassLoaderTest.java	Thu Jun 20 10:22:50 2013 +0200
     1.3 @@ -23,12 +23,15 @@
     1.4  import java.net.URLClassLoader;
     1.5  import java.util.ArrayList;
     1.6  import java.util.Arrays;
     1.7 -import java.util.Enumeration;
     1.8 +import java.util.Collection;
     1.9  import java.util.List;
    1.10  import javax.script.Invocable;
    1.11  import javax.script.ScriptEngine;
    1.12  import javax.script.ScriptEngineManager;
    1.13  import javax.script.ScriptException;
    1.14 +import org.apidesign.html.boot.spi.Fn;
    1.15 +import org.apidesign.html.boot.impl.FindResources;
    1.16 +import org.apidesign.html.boot.impl.FnUtils;
    1.17  import static org.testng.Assert.*;
    1.18  import org.testng.annotations.BeforeClass;
    1.19  import org.testng.annotations.Test;
    1.20 @@ -52,13 +55,17 @@
    1.21          final URL my = JsClassLoaderTest.class.getProtectionDomain().getCodeSource().getLocation();
    1.22          ClassLoader parent = JsClassLoaderTest.class.getClassLoader().getParent();
    1.23          final URLClassLoader ul = new URLClassLoader(new URL[] { my }, parent);
    1.24 -        loader = new JsClassLoader(parent) {
    1.25 +        class Fr implements FindResources, Fn.Presenter {
    1.26              @Override
    1.27 -            protected URL findResource(String name) {
    1.28 -                return ul.getResource(name);
    1.29 +            public void findResources(String path, Collection<? super URL> results, boolean oneIsEnough) {
    1.30 +                URL u = ul.getResource(path);
    1.31 +                if (u != null) {
    1.32 +                    results.add(u);
    1.33 +                }
    1.34              }
    1.35 +
    1.36              @Override
    1.37 -            protected Fn defineFn(String code, String... names) {
    1.38 +            public Fn defineFn(String code, String... names) {
    1.39                  StringBuilder sb = new StringBuilder();
    1.40                  sb.append("(function() {");
    1.41                  sb.append("return function(");
    1.42 @@ -91,11 +98,12 @@
    1.43              }
    1.44  
    1.45              @Override
    1.46 -            protected Enumeration<URL> findResources(String name) {
    1.47 +            public void displayPage(URL page, Runnable onPageLoad) {
    1.48                  throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
    1.49              }
    1.50 -        };
    1.51 +        }
    1.52          
    1.53 +        loader = FnUtils.newLoader(new Fr(), new Fr(), parent);
    1.54          methodClass = loader.loadClass(JsMethods.class.getName());
    1.55      }
    1.56