1. Fix bug that "too much recursion" on AbstractList

zhourenjian · zhourenjian · commit 6d04801d0c99 · 2007-06-10T14:46:47.000Z
2. StringBuilder does not require Arrays and java.util.*
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/AbstractStringBuilder.java b/sources/net.sf.j2s.java.core/src/java/lang/AbstractStringBuilder.java
@@ -18,7 +18,7 @@
 package java.lang;
 
 import java.io.InvalidObjectException;
-import java.util.Arrays;
+//import java.util.Arrays;
 
 import org.apache.harmony.luni.util.Msg;
 
@@ -507,7 +507,10 @@ public void setLength(int length) {
                     value = newData;
                     shared = false;
                 } else {
-                    Arrays.fill(value, count, length, (char) 0);
+                    //Arrays.fill(value, count, length, (char) 0);
+                    for (int i = count; i < length; i++) {
+						value[i] = 0;
+					}
                 }
             }
         }
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/ClassExt.js b/sources/net.sf.j2s.java.core/src/java/lang/ClassExt.js
@@ -125,7 +125,12 @@ Clazz.innerTypeInstance = function (clazzInner, objThis, finalVars) {
 	} else */if (arguments.length == 3) {
 		obj = new clazzInner (objThis);
 	} else if (arguments.length == 4) {
-		obj = new clazzInner (objThis, arguments[3]);
+		if (objThis.__CLASS_NAME__ == clazzInner.__CLASS_NAME__
+				&& arguments[3] == Clazz.inheritArgs) {
+			obj = objThis;
+		} else {
+			obj = new clazzInner (objThis, arguments[3]);
+		}
 	} else if (arguments.length == 5) {
 		obj = new clazzInner (objThis, arguments[3], arguments[4]);
 	} else if (arguments.length == 6) {
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/ClassLoader.js b/sources/net.sf.j2s.java.core/src/java/lang/ClassLoader.js
@@ -2680,7 +2680,7 @@ window.setTimeout (function () {
 		}
 	}
 	/* start ClazzLoader hotspot monitoring after 1 second */
-	if (window["j2s.script.debugging"] == true) {
+	if (window["j2s.script.debugging"] == true && window["j2s.disable.hotspot"] != true) {
 		window.setTimeout (ClazzLoader.hotspotMonitoring, 1000);
 	}
 }, 324); // 0.324 seconds is considered as enough before refresh action

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`package java.lang;`
`19`	`19`
`20`	`20`	`import java.io.InvalidObjectException;`
`21`		`-import java.util.Arrays;`
	`21`	`+//import java.util.Arrays;`
`22`	`22`
`23`	`23`	`import org.apache.harmony.luni.util.Msg;`
`24`	`24`
`@@ -507,7 +507,10 @@ public void setLength(int length) {`
`507`	`507`	`value = newData;`
`508`	`508`	`shared = false;`
`509`	`509`	`} else {`
`510`		`- Arrays.fill(value, count, length, (char) 0);`
	`510`	`+ //Arrays.fill(value, count, length, (char) 0);`
	`511`	`+ for (int i = count; i < length; i++) {`
	`512`	`+ value[i] = 0;`
	`513`	`+ }`
`511`	`514`	`}`
`512`	`515`	`}`
`513`	`516`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2680,7 +2680,7 @@ window.setTimeout (function () {`
`2680`	`2680`	`}`
`2681`	`2681`	`}`
`2682`	`2682`	`/* start ClazzLoader hotspot monitoring after 1 second */`
`2683`		`- if (window["j2s.script.debugging"] == true) {`
	`2683`	`+ if (window["j2s.script.debugging"] == true && window["j2s.disable.hotspot"] != true) {`
`2684`	`2684`	`window.setTimeout (ClazzLoader.hotspotMonitoring, 1000);`
`2685`	`2685`	`}`
`2686`	`2686`	`}, 324); // 0.324 seconds is considered as enough before refresh action`