Support delta *.js update to avoid re-downloading tons of *.js

zhourenjian · zhourenjian · commit 986c981d7a33 · 2010-04-28T07:54:19.000Z
Pack more *.js into fewer *.z.js to increase *.js loading
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
@@ -558,6 +558,28 @@ ClazzLoader.registerPackages = function (prefix, pkgs) {
  */
 /* protected */
 ClazzLoader.multipleSites = function (path) {
+	var deltas = window["j2s.update.delta"];
+	if (deltas != null && deltas instanceof Array && deltas.length >= 3) {
+		var lastOldVersion = null;
+		var lastNewVersion = null;
+		for (var i = 0; i < deltas.length / 3; i++) {
+			var oldVersion = deltas[i + i + i];
+			if (oldVersion != "$") {
+				lastOldVersion = oldVersion;
+			}
+			var newVersion = deltas[i + i + i + 1];
+			if (newVersion != "$") {
+				lastNewVersion = newVersion;
+			}
+			var relativePath = deltas[i + i + i + 2];
+			var key = lastOldVersion + "/" + relativePath;
+			var idx = path.indexOf (key);
+			if (idx != -1 && idx == path.length - key.length) {
+				path = path.substring (0, idx) + lastNewVersion + "/" + relativePath;
+				break;
+			}
+		}
+	}
 	var length = path.length;
 	if (ClazzLoader.maxLoadingThreads > 1 
 			&& ((length > 15 && path.substring (0, 15) == "http://archive.")
@@ -1098,6 +1120,7 @@ ClazzLoader.loadScript = function (file) {
 			alert ("[Java2Script] XMLHttpRequest not supported!");
 			return;
 		}
+
 		transport.open ("GET", file, ClazzLoader.isAsynchronousLoading);
 		// transport.setRequestHeader ("User-Agent",
 		// 		"Java2Script-Pacemaker/1.0 (+http://j2s.sourceforge.net)");
diff --git a/sources/net.sf.j2s.java.core/src/java/package.js b/sources/net.sf.j2s.java.core/src/java/package.js
@@ -12,17 +12,59 @@ window["java.registered"] = false;
 
 	var base = ClazzLoader.getClasspathFor ("java.*");
 	
-	ClazzLoader.loadZJar (base + "error.z.js", "java.lang.Throwable");
+	//ClazzLoader.loadZJar (base + "error.z.js", "java.lang.Throwable");
 	ClazzLoader.loadZJar (base + "core.z.js", ClazzLoader.runtimeKeyClass); //"java.lang.String"
 
 	ClazzLoader.jarClasspath (base + "core.z.js", [
+        "java.lang.Void",
+		"$.reflect.AccessibleObject",
+		"$.AnnotatedElement",
+		"$.GenericDeclaration",
+		"$.InvocationHandler",
+		"$.Member",
+        "$.Modifier",
+		"$.Constructor",
+        "$.Field",
+        "$.Method",
+        
 		"java.net.URLEncoder",
 		"java.net.URLDecoder",
 
 		"net.sf.j2s.ajax.HttpRequest",
 		"$.ARunnable",
 		"$.AClass",
 		"$.ASWTClass",
+
+		"net.sf.j2s.ajax.IXHRCallback",
+		"$.XHRCallbackAdapter",
+		"$.XHRCallbackSWTAdapter",
+       	
+		"$.SimpleSerializable",
+		"$.SimpleFilter",
+		"$.SimpleRPCRunnable",
+		"$.ISimpleRequestInfoBinding",
+		"$.ISimpleRequestInfo",
+		"$.ISimpleGeoLocationBinding",
+		"$.ISimpleGeoLocation",
+		"$.SimpleRPCRequest",
+		"$.SimpleRPCSWTRequest",
+       	
+		"$.SimplePipeRunnable",
+		"$.ISimplePipePriority",
+		"$.SimplePipeHelper",
+		"$.SimplePipeRequest",
+		"$.SimplePipeSWTRequest",
+       	
+		"$.CompoundSerializable",
+		"$.CompoundPipeSession",
+		"$.CompoundPipeRunnable",
+		"$.CompoundPipeRequest",
+		"$.CompoundPipeSWTRequest",
+		
+  		"net.sf.j2s.store.IStore",
+  		"$.CookieStore",
+  		"$.XSSCookieStore",
+  		"$.SimpleStore"
 	]);
 
 	ClazzLoader.jarClasspath (base + "util/AbstractList.js", [
@@ -78,54 +120,6 @@ window["java.registered"] = false;
 		"java.util.Collections.UnmodifiableSortedSet"
 	]);
 
-	ClazzLoader.jarClasspath (base + "lang/reflect.z.js", [
-        "java.lang.Void",
-		"$.reflect.AccessibleObject",
-		"$.AnnotatedElement",
-		"$.GenericDeclaration",
-		"$.InvocationHandler",
-		"$.Member",
-        "$.Modifier",
-		"$.Constructor",
-        "$.Field",
-        "$.Method"
-	]);
-
-var isDebugging = (window["ajax.debugging"] == true);
-if (!isDebugging) {
-	/* ajax library */
-	ClazzLoader.jarClasspath (ClazzLoader.getClasspathFor ("net.sf.j2s.ajax.*") + "simple.z.js", [
-		"net.sf.j2s.ajax.IXHRCallback",
-		"$.XHRCallbackAdapter",
-		"$.XHRCallbackSWTAdapter",
-       	
-		"$.SimpleSerializable",
-		"$.SimpleFilter",
-		"$.SimpleRPCRunnable",
-		"$.SimpleRPCRequest",
-		"$.SimpleRPCSWTRequest",
-       	
-		"$.SimplePipeRunnable",
-		"$.ISimplePipePriority",
-		"$.SimplePipeHelper",
-		"$.SimplePipeRequest",
-		"$.SimplePipeSWTRequest",
-       	
-		"$.CompoundSerializable",
-		"$.CompoundPipeSession",
-		"$.CompoundPipeRunnable",
-		"$.CompoundPipeRequest",
-		"$.CompoundPipeSWTRequest"
-	]);
-}
-
-	ClazzLoader.jarClasspath (ClazzLoader.getClasspathFor ("net.sf.j2s.*") + "store.z.js", [
-  		"net.sf.j2s.store.IStore",
-  		"$.CookieStore",
-  		"$.XSSCookieStore",
-  		"$.SimpleStore"
-  	]);
-
 	ClazzLoader.jarClasspath (base + "lang/StringBuilder.z.js", 
 		["java.lang.AbstractStringBuilder", "$.StringBuilder"]);
 	base = base.substring (0, base.lastIndexOf ("java/"));
