Add support for new functions in net.sf.j2s.ui.

zhourenjian · zhourenjian · commit 1bfe0a89c744 · 2007-03-04T18:17:56.000Z
diff --git a/sources/net.sf.j2s.java.core/src/.release b/sources/net.sf.j2s.java.core/src/.release
@@ -0,0 +1,4 @@
+#Java2Script Release
+#Sun Mar 04 22:38:19 CST 2007
+alias=1.0.0-m5
+version=20070304
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
@@ -2060,7 +2060,7 @@ ClazzLoader.getJ2SLibBase = function () {
 		if (idx != -1) {
 			return src.substring (0, idx);
 		}
-		idx = src.indexOf ("j2slib.core.js"); // consider it as key string!
+		idx = src.indexOf ("j2slibcore.z.js"); // consider it as key string!
 		if (idx != -1) {
 			return src.substring (0, idx);
 		}
@@ -2124,12 +2124,9 @@ ClazzLoader.loadClass = function (name, optionalsLoaded, forced, async) {
 	if (name.indexOf (swtPkg) == 0 || name.indexOf ("$wt") == 0) {
 		ClazzLoader.assurePackageClasspath (swtPkg);
 	}
-	/*
-	 * "junit" is not considered as inner supported library.
-	 */
-	//if (name.indexOf ("junit") == 0) {
-	//	ClazzLoader.assurePackageClasspath ("junit");
-	//}
+	if (name.indexOf ("junit") == 0) {
+		ClazzLoader.assurePackageClasspath ("junit");
+	}
 
 	/*
 	 * Any ClazzLoader#loadClass calls will be queued until java.* core classes
@@ -2189,11 +2186,14 @@ ClazzLoader.loadClass = function (name, optionalsLoaded, forced, async) {
 			}
 		}
 	} else if (optionalsLoaded != null && ClazzLoader.isClassDefined (name)) {
-		if (async) {
-			window.setTimeout (optionalsLoaded, 25);
-		} else {
-			optionalsLoaded ();
-		}
+		var nn = ClazzLoader.findClass (name);
+		if (nn == null || nn.status >= ClazzNode.STATUS_OPTIONALS_LOADED) {
+			if (async) {
+				window.setTimeout (optionalsLoaded, 25);
+			} else {
+				optionalsLoaded ();
+			}
+		} // else ... should be called later
 	}
 	
 };
@@ -2202,7 +2202,7 @@ ClazzLoader.loadClass = function (name, optionalsLoaded, forced, async) {
  * Load the application by the given class name and run its static main method.
  */
 /* public */
-$w$ = ClazzLoader.loadAppMain = function (clazz, args) {
+$w$ = ClazzLoader.loadJ2SApp = function (clazz, args, loaded) {
 	if (clazz == null) {
 		return;
 	}
@@ -2219,12 +2219,31 @@ $w$ = ClazzLoader.loadAppMain = function (clazz, args) {
 	if (agmts == null || !(agmts instanceof Array)) {
 		agmts = [];
 	}
-	var afterLoaded = (function (clazzName, argv) {
+	var afterLoaded = loaded;
+	if (afterLoaded == null) {
+		afterLoaded = (function (clazzName, argv) {
+			return function () {
+				Clazz.evalType (clazzName).main (argv);
+			};
+		}) (clazzStr, agmts);
+	} else {
+		afterLoaded = loaded(clazzStr, agmts);
+	}
+	ClazzLoader.loadClass (clazzStr, afterLoaded);
+};
+/**
+ * Load JUnit tests by the given class name.
+ */
+/* public */
+$u$ = ClazzLoader.loadJUnit = function (clazz, args) {
+	var afterLoaded = function (clazzName, argv) {
 		return function () {
-			Clazz.evalType (clazzName).main (argv);
+			ClazzLoader.loadClass ("junit.textui.TestRunner", function () {
+				junit.textui.TestRunner.run (Clazz.evalType (clazzName));
+			});
 		};
-	}) (clazzStr, agmts);
-	ClazzLoader.loadClass (clazzStr, afterLoaded);
+	};
+	ClazzLoader.loadJ2SApp (clazz, args, afterLoaded);
 };
 
 /* private */
@@ -2368,14 +2387,14 @@ ClazzLoader.destroyClassNode = function (node) {
 };
 
 /*
- * Remove j2slib.z.js, j2slib.core.js or Class/Ext/Loader/.js.
+ * Remove j2slib.z.js, j2slibcore.z.js or Class/Ext/Loader/.js.
  */
 window.setTimeout (function () {
 	var ss = document.getElementsByTagName ("SCRIPT");
 	for (var i = 0; i < ss.length; i++) {
 		var src = ss[i].src;
-		if ((src.indexOf ("j2slib.z.js") != -1) 
-				|| (src.indexOf ("j2slib.core.js") != -1)) {
+		if (src.indexOf ("chrome:") != 0 && (src.indexOf ("j2slib.z.js") != -1
+				|| src.indexOf ("j2slibcore.z.js") != -1)) {
 			ClazzLoader.getJ2SLibBase (); // cached ...
 			ClazzLoader.removeScriptNode (ss[i]);
 			break;
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/ClassLoaderProgressMonitor.js b/sources/net.sf.j2s.java.core/src/java/lang/ClassLoaderProgressMonitor.js
@@ -17,6 +17,9 @@
  *******/
  
 /*
+ * Update: March 5, 2007
+ * ClassLoaderProgressMonitor were already in default j2slib.z.js.
+ *
  * ClassLoaderProgressMonitor is optional. It's used to display class loading 
  * progress so that user know that background loading is still processing.
  *
@@ -46,7 +49,7 @@ clpm.fadeAlpha = 0;
 clpm.monitorEl = null;
 clpm.lastScrollTop = 0;
 clpm.bindingParent = null;
-clpm.DEFAULT_OPACITY = 75;
+clpm.DEFAULT_OPACITY = 55;
 /* private static */ clpm.clearChildren = function (el) {
 	if (el == null) return;
 	for (var i = el.childNodes.length - 1; i >= 0; i--) {
diff --git a/sources/net.sf.j2s.java.core/src/mozilla.addon.js b/sources/net.sf.j2s.java.core/src/mozilla.addon.js
@@ -0,0 +1,39 @@
+// mozilla.addon.js
+// Following script will make J2SLib compatiable with Java2Script addon
+function loadJ2SLibZJS (path, cb) {
+	var sxr = document.createElement ("SCRIPT");
+	sxr.src = path;
+	sxr.type = "text/javascript";
+	if (cb) {
+		var t = "onreadystatechange";
+		var xhrCallback = function () {
+			var s = this.readyState;
+			if (s == null || s == "loaded" || s == "complete") {
+				window["j2s.lib"].onload ();
+			}
+		};
+		if (typeof sxr[t] == "undefined") {
+			sxr.onload = xhrCallback;
+		} else {
+			sxr[t] = xhrCallback;
+		}
+	}
+	document.getElementsByTagName ("HEAD")[0].appendChild (sxr);
+};
+if (navigator.userAgent.toLowerCase ().indexOf ("gecko") != -1) {
+	loadJ2SLibZJS("chrome://java2script/content/j2slib.js");
+	window.setTimeout (function () {
+		if (window["j2s.addon.loaded"]) return; // Loaded by Firefox addon!
+		var o = window["j2s.lib"];
+		if (o.base == null) {
+			o.base = "http://archive.java2script.org/";
+		}
+		loadJ2SLibZJS(o.base + (o.alias ? o.alias : o.version) + "/j2slib.z.js", o.onload);
+	}, 300); // with 0.3 second lag! 0.3 is enough for chrome://*.js to be loaded.
+} else {
+	var o = window["j2s.lib"];
+	if (o.base == null) {
+		o.base = "http://archive.java2script.org/";
+	}
+	loadJ2SLibZJS(o.base + (o.alias ? o.alias : o.version) + "/j2slib.z.js", o.onload);
+}
