Directly referencing base classes as they have to be visible in the mini module
1.1 --- a/rt/emul/mini/src/main/java/java/lang/Boolean.java Sun Apr 24 08:28:22 2016 +0200
1.2 +++ b/rt/emul/mini/src/main/java/java/lang/Boolean.java Sun Apr 24 14:17:09 2016 +0200
1.3 @@ -286,7 +286,7 @@
1.4 initValueOf();
1.5 }
1.6 @JavaScriptBody(args = { }, body =
1.7 - "var bc = vm.java_lang_Boolean(false);\n" +
1.8 + "var bc = java_lang_Boolean(false);\n" +
1.9 "bc.valueOf = function() { return this._value() ? true : false; };\n" +
1.10 "bc.toString = function() { return this.valueOf().toString(); };\n"
1.11 )
2.1 --- a/rt/emul/mini/src/main/java/java/lang/Class.java Sun Apr 24 08:28:22 2016 +0200
2.2 +++ b/rt/emul/mini/src/main/java/java/lang/Class.java Sun Apr 24 14:17:09 2016 +0200
2.3 @@ -1836,7 +1836,7 @@
2.4 }
2.5 }
2.6
2.7 - @JavaScriptBody(args = {}, body = "var p = vm.java_lang_Object(false);"
2.8 + @JavaScriptBody(args = {}, body = "var p = java_lang_Object(false);"
2.9 + "p.toString = function() { return this.toString__Ljava_lang_String_2(); };"
2.10 )
2.11 static native void registerToString();
3.1 --- a/rt/emul/mini/src/main/java/java/lang/Number.java Sun Apr 24 08:28:22 2016 +0200
3.2 +++ b/rt/emul/mini/src/main/java/java/lang/Number.java Sun Apr 24 14:17:09 2016 +0200
3.3 @@ -128,7 +128,7 @@
3.4 initValueOf();
3.5 }
3.6 @JavaScriptBody(args = { }, body =
3.7 - "var p = vm.java_lang_Number(false);\n" +
3.8 + "var p = java_lang_Number(false);\n" +
3.9 "p.valueOf = function() { return this.doubleValue__D(); };\n" +
3.10 "p.toString = function() { return this.toString__Ljava_lang_String_2(); };"
3.11 )
4.1 --- a/rt/emul/mini/src/main/java/java/lang/String.java Sun Apr 24 08:28:22 2016 +0200
4.2 +++ b/rt/emul/mini/src/main/java/java/lang/String.java Sun Apr 24 14:17:09 2016 +0200
4.3 @@ -33,7 +33,6 @@
4.4 import org.apidesign.bck2brwsr.core.Exported;
4.5 import org.apidesign.bck2brwsr.core.ExtraJavaScript;
4.6 import org.apidesign.bck2brwsr.core.JavaScriptBody;
4.7 -import org.apidesign.bck2brwsr.core.JavaScriptOnly;
4.8 import org.apidesign.bck2brwsr.core.JavaScriptPrototype;
4.9 import org.apidesign.bck2brwsr.emul.lang.System;
4.10
4.11 @@ -124,7 +123,7 @@
4.12 registerToString();
4.13 }
4.14 @JavaScriptBody(args = {}, body =
4.15 - "var p = vm.java_lang_String(false);\n"
4.16 + "var p = java_lang_String(false);\n"
4.17 + "p.toString = function() {\nreturn this._r().toString();\n};\n"
4.18 + "p.valueOf = function() {\nreturn this._r().valueOf();\n}\n"
4.19 )