Fixed a ClassLoader bug that SWT Java2Script Application's *.*#main is not executed.

zhourenjian · zhourenjian · commit 49bc115e345d · 2007-03-08T16:10:12.000Z
Packed some lately added/modified classes into *.z.js
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/Class.js b/sources/net.sf.j2s.java.core/src/java/lang/Class.js
@@ -1695,6 +1695,11 @@ Clazz.declarePackage ("java.util");
 /*
  * Consider these interfaces are basic!
  */
+Clazz.declareInterface (java.io,"Closeable");
+Clazz.declareInterface (java.io,"DataInput");
+Clazz.declareInterface (java.io,"DataOutput");
+Clazz.declareInterface (java.io,"Externalizable");
+Clazz.declareInterface (java.io,"Flushable");
 Clazz.declareInterface (java.io,"Serializable");
 Clazz.declareInterface (java.lang,"Iterable");
 Clazz.declareInterface (java.lang,"CharSequence");
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
@@ -1162,7 +1162,7 @@ ClazzLoader.tryToLoadNext = function (file) {
 	 */
 	if (ClazzLoader.lockQueueBe4SWT && ClazzLoader.pkgRefCount != 0 
 			&& file.lastIndexOf ("package.js") != file.length - 10
-			&& (ClazzLoader.isGecko || ClazzLoader.isIE)) { // No Opera!
+			&& !ClazzLoader.isOpera) { // No Opera! Opera is in single thread.
 		var qbs = ClazzLoader.queueBe4SWT;
 		qbs[qbs.length] = file;
 		return;
@@ -2298,11 +2298,17 @@ ClazzLoader.runtimeLoaded = function () {
  */
 /* public */
 ClazzLoader.loadZJar = function (zjarPath, keyClazz) {
-	ClazzLoader.jarClasspath (zjarPath, [keyClazz]);
+	var keyClass = keyClazz;
+	var isArr = (keyClazz instanceof Array);
+	if (isArr) {
+		keyClass = keyClazz[keyClazz.length - 1];
+	}
+	ClazzLoader.jarClasspath (zjarPath, isArr ? keyClazz
+			: [keyClazz]);
 	if (keyClazz == ClazzLoader.runtimeKeyClass) {
-		ClazzLoader.loadClass (keyClazz, ClazzLoader.runtimeLoaded, true);
+		ClazzLoader.loadClass (keyClass, ClazzLoader.runtimeLoaded, true);
 	} else {
-		ClazzLoader.loadClass (keyClazz, null, true);
+		ClazzLoader.loadClass (keyClass, null, true);
 	}
 };
 
@@ -2363,7 +2369,8 @@ ClazzLoader.addChildClassNode = function (parent, child, type) {
 			break;
 		}
 	}
-	if (!existed) {
+	if (!existed && parent.name != null && parent != ClazzLoader.clazzTreeRoot
+			&& parent != child) {
 		child.parents[child.parents.length] = parent;
 	}
 };
diff --git a/sources/net.sf.j2s.java.core/src/java/package.js b/sources/net.sf.j2s.java.core/src/java/package.js
@@ -16,6 +16,9 @@ window["java.registered"] = false;
 	ClazzLoader.loadZJar (base + "core.z.js", ClazzLoader.runtimeKeyClass); //"java.lang.String"
 
 	ClazzLoader.jarClasspath (base + "core.z.js", [
+		"java.net.URLEncoder",
+		"java.net.URLDecoder",
+		
 		"net.sf.j2s.ajax.HttpRequest",
 		"$.IXHRCallback",
 		"$.XHRCallbackAdapter",
@@ -93,11 +96,11 @@ window["java.registered"] = false;
         "$.Field",
         "$.Method"
 	]);
+	ClazzLoader.jarClasspath (base + "lang/StringBuilder.z.js", 
+		["java.lang.AbstractStringBuilder", "$.StringBuilder"]);
 	base = base.substring (0, base.lastIndexOf ("java/"));
-	ClazzLoader.jarClasspath (base + "org/apache/harmony/luni/util/Msg.js", 
-		["org.apache.harmony.luni.util.Msg"]);
-	ClazzLoader.jarClasspath (base + "org/apache/harmony/luni/util/MsgHelp.js", 
-		["org.apache.harmony.luni.util.MsgHelp"]);
+	ClazzLoader.jarClasspath (base + "org/apache/harmony/luni/util/Msg.z.js", 
+		["org.apache.harmony.luni.util.Msg", "$.MsgHelp"]);
 }) ();
 
 /* private */
