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

zhourenjian · zhourenjian · commit 4119e86dcb8c · 2010-04-28T07:54:13.000Z
Pack more *.js into fewer *.z.js to increase *.js loading
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/package.js b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/package.js
@@ -317,8 +317,9 @@ $wt = org.eclipse.swt;
 
 	var path = ClazzLoader.getClasspathFor ("org.eclipse.swt.*");
 	
-	// The core.z.js should already intialized
-	ClazzLoader.loadZJar (path + "events.z.js", [
+var isDebugging = (window["swt.debugging"] == true);
+if (!isDebugging) {
+	ClazzLoader.jarClasspath (path + "basic.z.js", [
 		"org.eclipse.swt.internal.SWTEventListener",
 		"$.SWTEventObject",
 		"org.eclipse.swt.widgets.Event",
@@ -368,12 +369,8 @@ $wt = org.eclipse.swt;
 		"$.TreeListener",
 		"$.TreeAdapter",
 		"$.VerifyListener",
-		"org.eclipse.swt.widgets.EventTable"
-	]);
-
-var isDebugging = (window["swt.debugging"] == true);
-if (!isDebugging) {
-	ClazzLoader.jarClasspath (path + "basic.z.js", [
+		"org.eclipse.swt.widgets.EventTable",
+		
 		"$wt.internal.SerializableCompatibility",
 		"$.CloneableCompatibility",
 		"$.RunnableCompatibility",
@@ -403,9 +400,8 @@ if (!isDebugging) {
 		"$.FontMetrics",
 		"$.Font",
 
-		"$wt.widgets.Monitor"
-	]);
-	ClazzLoader.jarClasspath (path + "more.z.js", [
+		"$wt.widgets.Monitor",
+		
 		"$wt.internal.ResizeHandler",
 		"$wt.internal.ResizeSystem",
 
@@ -446,16 +442,33 @@ if (!isDebugging) {
 		"$.Shell",
 		"$.Dialog"
 	]);
+	ClazzLoader.jarClasspath (wPath + "more.z.js", [
+   		"$wt.widgets.Label",
+   		"$.Button",
+   		"$.Text",
+   		"$.Group",
+   		"$.TabItem",
+   		"$.TabFolder",
+   		"$.TrayItem",
+   		"$.Tray",
+   		"$.MenuItem",
+   		"$.Menu",
+   		"$.Link",
+   		"$.Combo",
+   		"$wt.browser.Browser",
+   		"$wt.program.Program",
+   		"$wt.layout.GridData",
+   		"$.GridLayout",
+   		"$.FillData",
+   		"$.FillLayout"
+   	]);
+
 	var w = "$wt.widgets.";
 	ClazzLoader.jarClasspath (wPath + "Tree.z.js", [
 		w + "TreeItem",
 		"$.TreeColumn",
 		"$.Tree"
 	]);
-	ClazzLoader.jarClasspath (wPath + "Tray.z.js", [
-		w + "TrayItem",
-		"$.Tray"
-	]);
 	ClazzLoader.jarClasspath (wPath + "ToolBar.z.js", [
 		w + "ToolItem",
 		"$.ToolBar"
@@ -507,33 +520,13 @@ if (!isDebugging) {
 		"$wt.internal.dnd.ScaleDND",
 		w + "Scale"
 	]);
-	ClazzLoader.jarClasspath (wPath + "Menu.z.js", [
-		w + "MenuItem",
-		"$.Menu"
-	]);
 	ClazzLoader.jarClasspath (wPath + "CoolBar.z.js", [
 		w + "CoolItem",
 		"$.CoolBar"
 	]);
-	ClazzLoader.jarClasspath (wPath + "Common.z.js", [
-		w + "Label",
-		"$.Button",
-		"$.Text",
-		"$.Group",
-		"$.TabItem",
-		"$.TabFolder"
-	]);
 	
 	var lPath = ClazzLoader.getClasspathFor ("org.eclipse.swt.layout.*");
 	var l = "$wt.layout.";
-	ClazzLoader.jarClasspath (lPath + "GridLayout.z.js", [
-		l + "GridData",
-		"$.GridLayout"
-	]);
-	ClazzLoader.jarClasspath (lPath + "FillLayout.z.js", [
-		l + "FillData",
-		"$.FillLayout"
-	]);
 	ClazzLoader.jarClasspath (lPath + "RowLayout.z.js", [
 		l + "RowData",
 		"$.RowLayout"
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/NotificationCorner.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/NotificationCorner.java
@@ -180,6 +180,8 @@ public void run() {
 		}
 
 		updateEvents();
+		
+		bringToTop(window.currentTopZIndex);
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -180,6 +180,8 @@ public void run() {`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`updateEvents();`
	`183`	`+`
	`184`	`+ bringToTop(window.currentTopZIndex);`
`183`	`185`	`}`
`184`	`186`
`185`	`187`	`/**`