1.1 --- a/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/JSLauncher.java	Mon Jan 28 12:18:24 2013 +0100
     1.2 +++ b/launcher/src/main/java/org/apidesign/bck2brwsr/launcher/JSLauncher.java	Fri Mar 22 16:59:47 2013 +0100
     1.3 @@ -17,6 +17,7 @@
     1.4   */
     1.5  package org.apidesign.bck2brwsr.launcher;
     1.6  
     1.7 +import org.apidesign.bck2brwsr.launcher.impl.Console;
     1.8  import java.io.IOException;
     1.9  import java.io.InputStream;
    1.10  import java.net.URL;
    1.11 @@ -43,18 +44,17 @@
    1.12      private Object console;
    1.13      
    1.14      
    1.15 -    @Override MethodInvocation addMethod(Class<?> clazz, String method, String html) {
    1.16 -        loaders.add(clazz.getClassLoader());
    1.17 -        MethodInvocation mi = new MethodInvocation(clazz.getName(), method, html);
    1.18 +    @Override InvocationContext runMethod(InvocationContext mi) {
    1.19 +        loaders.add(mi.clazz.getClassLoader());
    1.20          try {
    1.21              long time = System.currentTimeMillis();
    1.22 -            LOG.log(Level.FINE, "Invoking {0}.{1}", new Object[]{mi.className, mi.methodName});
    1.23 +            LOG.log(Level.FINE, "Invoking {0}.{1}", new Object[]{mi.clazz.getName(), mi.methodName});
    1.24              String res = code.invokeMethod(
    1.25                  console,
    1.26                  "invoke__Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2",
    1.27 -                mi.className, mi.methodName).toString();
    1.28 +                mi.clazz.getName(), mi.methodName).toString();
    1.29              time = System.currentTimeMillis() - time;
    1.30 -            LOG.log(Level.FINE, "Resut of {0}.{1} = {2} in {3} ms", new Object[]{mi.className, mi.methodName, res, time});
    1.31 +            LOG.log(Level.FINE, "Resut of {0}.{1} = {2} in {3} ms", new Object[]{mi.clazz.getName(), mi.methodName, res, time});
    1.32              mi.result(res, null);
    1.33          } catch (ScriptException | NoSuchMethodException ex) {
    1.34              mi.result(null, ex);
    1.35 @@ -89,7 +89,7 @@
    1.36          ScriptEngine mach = sem.getEngineByExtension("js");
    1.37  
    1.38          sb.append(
    1.39 -              "\nvar vm = new bck2brwsr(org.apidesign.bck2brwsr.launcher.Console.read);"
    1.40 +              "\nvar vm = new bck2brwsr(org.apidesign.bck2brwsr.launcher.impl.Console.read);"
    1.41              + "\nfunction initVM() { return vm; };"
    1.42              + "\n");
    1.43