diff -r 4a1398eff4fb -r 234fea368401 rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java --- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java Sat Apr 26 21:30:06 2014 +0200 +++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java Sun Apr 27 22:40:17 2014 +0200 @@ -64,15 +64,14 @@ } static void compile(Appendable out, - Bck2Brwsr.Resources l, - StringArray rootNames, - StringArray names, - boolean extension + Bck2Brwsr config ) throws IOException { - StringArray both = names.addAndNew(rootNames.toArray()); + String[] both = config.allClasses(); - VM vm = extension ? new Extension(out, l, both.toArray(), rootNames) - : new Standalone(out, l, rootNames); + VM vm = config.isExtension() ? + new Extension(out, config.getResources(), both, config.rootClasses()) + : + new Standalone(out, config.getResources(), config.rootClasses()); final StringArray fixedNames = new StringArray(); @@ -80,7 +79,7 @@ fixedNames.add(fixedClass.getName().replace('.', '/')); } - vm.doCompile(fixedNames.addAndNew(both.toArray())); + vm.doCompile(fixedNames.addAndNew(both)); } private void doCompile(StringArray names) throws IOException {