diff -r d3a0383d01d3 -r 5e13b1ac2886 emul/mini/src/main/java/java/lang/String.java --- a/emul/mini/src/main/java/java/lang/String.java Thu Jan 24 18:03:29 2013 +0100 +++ b/emul/mini/src/main/java/java/lang/String.java Sat Jan 26 08:47:05 2013 +0100 @@ -115,7 +115,7 @@ /** use serialVersionUID from JDK 1.0.2 for interoperability */ private static final long serialVersionUID = -6849794470754667710L; - @JavaScriptOnly(name="toString", value="function() { return this.fld_r; }") + @JavaScriptOnly(name="toString", value="String.prototype._r") private static void jsToString() { } @@ -174,7 +174,7 @@ "for (var i = 0; i < charArr.length; i++) {\n" + " if (typeof charArr[i] === 'number') charArr[i] = String.fromCharCode(charArr[i]);\n" + "}\n" - + "this.fld_r = charArr.join('');\n" + + "this._r(charArr.join(''));\n" ) public String(char value[]) { } @@ -205,7 +205,7 @@ "for (var i = off; i < up; i++) {\n" + " if (typeof charArr[i] === 'number') charArr[i] = String.fromCharCode(charArr[i]);\n" + "}\n" + - "this.fld_r = charArr.slice(off, up).join(\"\");\n" + "this._r(charArr.slice(off, up).join(\"\"));\n" ) public String(char value[], int offset, int count) { }