# HG changeset patch # User Jaroslav Tulach # Date 1354827730 -3600 # Node ID aeb9fe11cd60a649eb38a6a37d50e0e83e36e970 # Parent 6e8422eca1ed1060df51c7157a31f814d95924b4 The loadClass method accept class name with dots diff -r 6e8422eca1ed -r aeb9fe11cd60 vm/src/main/java/org/apidesign/vm4brwsr/GenJS.java --- a/vm/src/main/java/org/apidesign/vm4brwsr/GenJS.java Thu Dec 06 21:54:40 2012 +0100 +++ b/vm/src/main/java/org/apidesign/vm4brwsr/GenJS.java Thu Dec 06 22:02:10 2012 +0100 @@ -114,7 +114,7 @@ } out.append( " global.bck2brwsr = function() { return {\n" - + " loadClass : function(name) { return vm[name](true); }\n" + + " loadClass : function(name) { return vm[name.replace__Ljava_lang_String_2CC(name, '.','_')](true); }\n" + " };\n};\n"); out.append("}(this));"); } diff -r 6e8422eca1ed -r aeb9fe11cd60 vm/src/test/java/org/apidesign/vm4brwsr/CompareVMs.java --- a/vm/src/test/java/org/apidesign/vm4brwsr/CompareVMs.java Thu Dec 06 21:54:40 2012 +0100 +++ b/vm/src/test/java/org/apidesign/vm4brwsr/CompareVMs.java Thu Dec 06 22:02:10 2012 +0100 @@ -127,7 +127,7 @@ try { compileTheCode(m.getDeclaringClass()); Object vm = code.invokeFunction("bck2brwsr"); - Object inst = code.invokeMethod(vm, "loadClass", m.getDeclaringClass().getName().replace('.', '_')); + Object inst = code.invokeMethod(vm, "loadClass", m.getDeclaringClass().getName()); value = code.invokeMethod(inst, m.getName() + "__I"); } catch (Exception ex) { throw new AssertionError(StaticMethodTest.dumpJS(codeSeq)).initCause(ex); diff -r 6e8422eca1ed -r aeb9fe11cd60 vm/src/test/java/org/apidesign/vm4brwsr/NumberTest.java --- a/vm/src/test/java/org/apidesign/vm4brwsr/NumberTest.java Thu Dec 06 21:54:40 2012 +0100 +++ b/vm/src/test/java/org/apidesign/vm4brwsr/NumberTest.java Thu Dec 06 22:02:10 2012 +0100 @@ -162,7 +162,7 @@ Object ret = null; try { ret = code.invokeFunction("bck2brwsr"); - ret = code.invokeMethod(ret, "loadClass", clazz.getName().replace('.', '_')); + ret = code.invokeMethod(ret, "loadClass", clazz.getName()); ret = code.invokeMethod(ret, method, args); } catch (ScriptException ex) { fail("Execution failed in\n" + StaticMethodTest.dumpJS(codeSeq), ex); diff -r 6e8422eca1ed -r aeb9fe11cd60 vm/src/test/java/org/apidesign/vm4brwsr/StaticMethodTest.java --- a/vm/src/test/java/org/apidesign/vm4brwsr/StaticMethodTest.java Thu Dec 06 21:54:40 2012 +0100 +++ b/vm/src/test/java/org/apidesign/vm4brwsr/StaticMethodTest.java Thu Dec 06 22:02:10 2012 +0100 @@ -263,7 +263,7 @@ Object ret = null; try { ret = toRun.invokeFunction("bck2brwsr"); - ret = toRun.invokeMethod(ret, "loadClass", clazz.getName().replace('.', '_')); + ret = toRun.invokeMethod(ret, "loadClass", clazz.getName()); ret = toRun.invokeMethod(ret, method, args); } catch (ScriptException ex) { fail("Execution failed in\n" + dumpJS(theCode), ex);