# HG changeset patch # User Jaroslav Tulach # Date 1461500229 -7200 # Node ID 81a7a4fcaf4628fef3696527d6b84fb3ea07a359 # Parent 6d578ccd680a52eecef4a5b4902a4d5ac4967607 Directly referencing base classes as they have to be visible in the mini module diff -r 6d578ccd680a -r 81a7a4fcaf46 rt/emul/mini/src/main/java/java/lang/Boolean.java --- a/rt/emul/mini/src/main/java/java/lang/Boolean.java Sun Apr 24 08:28:22 2016 +0200 +++ b/rt/emul/mini/src/main/java/java/lang/Boolean.java Sun Apr 24 14:17:09 2016 +0200 @@ -286,7 +286,7 @@ initValueOf(); } @JavaScriptBody(args = { }, body = - "var bc = vm.java_lang_Boolean(false);\n" + + "var bc = java_lang_Boolean(false);\n" + "bc.valueOf = function() { return this._value() ? true : false; };\n" + "bc.toString = function() { return this.valueOf().toString(); };\n" ) diff -r 6d578ccd680a -r 81a7a4fcaf46 rt/emul/mini/src/main/java/java/lang/Class.java --- a/rt/emul/mini/src/main/java/java/lang/Class.java Sun Apr 24 08:28:22 2016 +0200 +++ b/rt/emul/mini/src/main/java/java/lang/Class.java Sun Apr 24 14:17:09 2016 +0200 @@ -1836,7 +1836,7 @@ } } - @JavaScriptBody(args = {}, body = "var p = vm.java_lang_Object(false);" + @JavaScriptBody(args = {}, body = "var p = java_lang_Object(false);" + "p.toString = function() { return this.toString__Ljava_lang_String_2(); };" ) static native void registerToString(); diff -r 6d578ccd680a -r 81a7a4fcaf46 rt/emul/mini/src/main/java/java/lang/Number.java --- a/rt/emul/mini/src/main/java/java/lang/Number.java Sun Apr 24 08:28:22 2016 +0200 +++ b/rt/emul/mini/src/main/java/java/lang/Number.java Sun Apr 24 14:17:09 2016 +0200 @@ -128,7 +128,7 @@ initValueOf(); } @JavaScriptBody(args = { }, body = - "var p = vm.java_lang_Number(false);\n" + + "var p = java_lang_Number(false);\n" + "p.valueOf = function() { return this.doubleValue__D(); };\n" + "p.toString = function() { return this.toString__Ljava_lang_String_2(); };" ) diff -r 6d578ccd680a -r 81a7a4fcaf46 rt/emul/mini/src/main/java/java/lang/String.java --- a/rt/emul/mini/src/main/java/java/lang/String.java Sun Apr 24 08:28:22 2016 +0200 +++ b/rt/emul/mini/src/main/java/java/lang/String.java Sun Apr 24 14:17:09 2016 +0200 @@ -33,7 +33,6 @@ import org.apidesign.bck2brwsr.core.Exported; import org.apidesign.bck2brwsr.core.ExtraJavaScript; import org.apidesign.bck2brwsr.core.JavaScriptBody; -import org.apidesign.bck2brwsr.core.JavaScriptOnly; import org.apidesign.bck2brwsr.core.JavaScriptPrototype; import org.apidesign.bck2brwsr.emul.lang.System; @@ -124,7 +123,7 @@ registerToString(); } @JavaScriptBody(args = {}, body = - "var p = vm.java_lang_String(false);\n" + "var p = java_lang_String(false);\n" + "p.toString = function() {\nreturn this._r().toString();\n};\n" + "p.valueOf = function() {\nreturn this._r().valueOf();\n}\n" )