1. Adjust packing order of j2slib.z.js to provide a faster loading

zhourenjian · zhourenjian · commit c867ee587868 · 2008-10-22T16:00:50.000Z
2. Add console support to SWT's Console window.
3. Provide another way to load images basing on classpath
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
@@ -1507,20 +1507,24 @@ Clazz.innerFunctions = {
 		if (name.indexOf ('/') == 0) {
 			//is.url = name.substring (1);
 			if (arguments.length == 2) { // additional argument
-				baseFolder = ClazzLoader.binaryFolders[0];
+				baseFolder = arguments[1];
+				if (baseFolder == null) {
+					baseFolder = ClazzLoader.binaryFolders[0];
+				}
 			} else if (window["ClazzLoader"] != null) {
 				baseFolder = ClazzLoader.getClasspathFor (clazzName, true);
 			}
 			if (baseFolder == null || baseFolder.length == 0) {
 				is.url = name.substring (1);
+			} else {
+				baseFolder = baseFolder.replace (/\\/g, '/');
+				var length = baseFolder.length;
+				var lastChar = baseFolder.charAt (length - 1);
+				if (lastChar != '/') {
+					baseFolder += "/";
+				}
+				is.url = baseFolder + name.substring (1);
 			}
-			baseFolder = baseFolder.replace (/\\/g, '/');
-			var length = baseFolder.length;
-			var lastChar = baseFolder.charAt (length - 1);
-			if (lastChar != '/') {
-				baseFolder += "/";
-			}
-			is.url = baseFolder + name.substring (1);
 		} else {
 			if (window["ClazzLoader"] != null) {
 				baseFolder = ClazzLoader.getClasspathFor (clazzName);
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
@@ -337,7 +337,7 @@ Clazz.makeFunction = function (jsr) {
 			jsr.setEvent (e);
 		}
 		jsr.run ();
-		if (e != null) {
+		if (e != null && jsr.isReturned != null && jsr.isReturned()) {
 			// Is it correct to stopPropagation here? --Feb 19, 2006
 			e.cancelBubble = true;
 			if (e.stopPropagation) {
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
@@ -77,7 +77,7 @@ clpm.DEFAULT_OPACITY = 55;
 	var div = document.createElement ("DIV");
 	div.style.cssText = "position:absolute;top:4px;left:4px;padding:2px 8px;"
 			+ "z-index:3333;background-color:#8e0000;color:yellow;" 
-			+ "font-family:Arial, sans-serif;white-space:nowrap;";
+			+ "font-family:Arial, sans-serif;font-size:10pt;white-space:nowrap;";
 	div.onmouseover = function () {
 		this.style.display = "none";
 	};
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/Console.js b/sources/net.sf.j2s.java.core/src/java/lang/Console.js
@@ -358,9 +358,35 @@ Console.consoleOutput = function (s, color, isBuffered) {
 		}
 	}
 	
+	var cssClazzName = console.parentNode.className;
+	if (!Console.pinning && cssClazzName != null
+			&& cssClazzName.indexOf ("composite") != -1) {
+		console.parentNode.scrollTop = console.parentNode.scrollHeight;
+	}
 	Console.lastOutputTime = new Date ().getTime ();
 };
 
+/*
+ * Clear all contents inside the console.
+ */
+/* public */
+Console.clear = function () {
+	Console.metLineBreak = true;
+	var console = document.getElementById ("_console_");;
+	if (console == null) {
+		if (document.body == null) {
+			Console.consoleBuffer = [];
+		}
+		return;
+	}
+	Console.consoleBuffer = [];
+	var childNodes = console.childNodes;
+	for (var i = childNodes.length - 1; i >= 0; i--) {
+		console.removeChild (childNodes[i]);
+	}
+	Console.linesCount = 0;
+};
+
 /**
  * popup is caching the original alert 
  */
diff --git a/sources/net.sf.j2s.java.core/src/java/package.js b/sources/net.sf.j2s.java.core/src/java/package.js
@@ -18,23 +18,11 @@ window["java.registered"] = false;
 	ClazzLoader.jarClasspath (base + "core.z.js", [
 		"java.net.URLEncoder",
 		"java.net.URLDecoder",
-		
+
 		"net.sf.j2s.ajax.HttpRequest",
-		"$.IXHRCallback",
-		"$.XHRCallbackAdapter",
-		"$.XHRCallbackSWTAdapter",
 		"$.ARunnable",
 		"$.AClass",
 		"$.ASWTClass",
-       	
-		"$.SimpleSerializable",
-		"$.SimpleRPCRunnable",
-		"$.SimpleRPCRequest",
-		"$.SimpleRPCSWTRequest",
-       	
-		"$.SimplePipeRunnable",
-		"$.SimplePipeRequest",
-		"$.SimplePipeSWTRequest"
 	]);
 
 	ClazzLoader.jarClasspath (base + "util/AbstractList.js", [
@@ -102,6 +90,30 @@ window["java.registered"] = false;
         "$.Field",
         "$.Method"
 	]);
+
+	/* ajax library */
+	ClazzLoader.jarClasspath (ClazzLoader.getClasspathFor ("net.sf.j2s.ajax.*") + "simple.z.js", [
+		"net.sf.j2s.ajax.IXHRCallback",
+		"$.XHRCallbackAdapter",
+		"$.XHRCallbackSWTAdapter",
+       	
+		"$.SimpleSerializable",
+		"$.SimpleRPCRunnable",
+		"$.SimpleRPCRequest",
+		"$.SimpleRPCSWTRequest",
+       	
+		"$.SimplePipeRunnable",
+		"$.SimplePipeHelper",
+		"$.SimplePipeRequest",
+		"$.SimplePipeSWTRequest",
+       	
+		"$.CompoundSerializable",
+		"$.CompoundPipeSession",
+		"$.CompoundPipeRunnable",
+		"$.CompoundPipeRequest",
+		"$.CompoundPipeSWTRequest"
+	]);
+	
 	ClazzLoader.jarClasspath (base + "lang/StringBuilder.z.js", 
 		["java.lang.AbstractStringBuilder", "$.StringBuilder"]);
 	base = base.substring (0, base.lastIndexOf ("java/"));

Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,7 @@ Clazz.makeFunction = function (jsr) {`
`337`	`337`	`jsr.setEvent (e);`
`338`	`338`	`}`
`339`	`339`	`jsr.run ();`
`340`		`- if (e != null) {`
	`340`	`+ if (e != null && jsr.isReturned != null && jsr.isReturned()) {`
`341`	`341`	`// Is it correct to stopPropagation here? --Feb 19, 2006`
`342`	`342`	`e.cancelBubble = true;`
`343`	`343`	`if (e.stopPropagation) {`