Fixed bug that AClass.loadClass can not accept null Runnable instance.

zhourenjian · zhourenjian · commit a02d8e39d38c · 2007-07-29T16:28:36.000Z
diff --git a/sources/net.sf.j2s.ajax/ajaxcore/net/sf/j2s/ajax/AClass.java b/sources/net.sf.j2s.ajax/ajaxcore/net/sf/j2s/ajax/AClass.java
@@ -45,35 +45,35 @@ protected AClass() {
 	 * 
 	 * @j2sNativeSrc
 	 * ClazzLoader.loadClass (clazzName, function () {
-	 * 	if (Clazz.instanceOf (afterLoaded, net.sf.j2s.ajax.ARunnable)) {
+	 * 	if (afterLoaded != null && Clazz.instanceOf (afterLoaded, net.sf.j2s.ajax.ARunnable)) {
 	 * 		var clz = Clazz.evalType (clazzName);
 	 * 		afterLoaded.setClazz (clz);
 	 * 	}
-	 * 	afterLoaded.run ();
+	 * 	if (afterLoaded != null) afterLoaded.run ();
 	 * }, false, true);
 	 * @j2sNative
 	 * ClazzLoader.loadClass (a, function () {
-	 * 	if (Clazz.instanceOf (b, net.sf.j2s.ajax.ARunnable)) {
+	 * 	if (b != null && Clazz.instanceOf (b, net.sf.j2s.ajax.ARunnable)) {
 	 * 		var clz = Clazz.evalType (a);
 	 * 		b.setClazz (clz);
 	 * 	}
-	 * 	b.run ();
+	 * 	if (b != null) b.run ();
 	 * }, false, true);
 	 */
 	public static void load(final String clazzName, final Runnable afterLoaded) {
 		new Thread(new Runnable() {
 			public void run() {
 				try {
 					Class clz = Class.forName(clazzName);
-					if (afterLoaded instanceof ARunnable) {
+					if (afterLoaded != null && afterLoaded instanceof ARunnable) {
 						ARunnable runnable = (ARunnable) afterLoaded;
 						runnable.setClazz(clz);
 					}
 				} catch (ClassNotFoundException e) {
 					e.printStackTrace();
 					return ;
 				}
-				afterLoaded.run();
+				if (afterLoaded != null) afterLoaded.run();
 			}
 		}).start();
 	}
diff --git a/sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleRPCHttpServlet.java b/sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleRPCHttpServlet.java
@@ -230,7 +230,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp)
 		resp.setHeader("Pragma", "no-cache");
 		resp.setHeader("Cache-Control", "no-cache");
 		resp.setDateHeader("Expires", 0);
-		resp.setContentType("text/plain;charset=utf-8");
+		resp.setContentType("text/plain; charset=utf-8");
 		//resp.setCharacterEncoding("utf-8");
 		PrintWriter writer = resp.getWriter();
 		runnable.deserialize(request);
diff --git a/sources/net.sf.j2s.ajax/ajaxswt/net/sf/j2s/ajax/ASWTClass.java b/sources/net.sf.j2s.ajax/ajaxswt/net/sf/j2s/ajax/ASWTClass.java
@@ -83,27 +83,27 @@ public static void swtLoad(String clazzName, Runnable afterLoaded) {
 	 * 
 	 * @j2sNativeSrc
 	 * ClazzLoader.loadClass (clazzName, function () {
-	 * 	if (Clazz.instanceOf (afterLoaded, net.sf.j2s.ajax.ARunnable)) {
+	 * 	if (afterLoaded != null && Clazz.instanceOf (afterLoaded, net.sf.j2s.ajax.ARunnable)) {
 	 * 		var clz = Clazz.evalType (clazzName);
 	 * 		afterLoaded.setClazz (clz);
 	 * 	}
-	 * 	afterLoaded.run ();
+	 * 	if (afterLoaded != null) afterLoaded.run ();
 	 * }, false, true);
 	 * @j2sNative
 	 * ClazzLoader.loadClass (b, function () {
-	 * 	if (Clazz.instanceOf (c, net.sf.j2s.ajax.ARunnable)) {
+	 * 	if (c != null && Clazz.instanceOf (c, net.sf.j2s.ajax.ARunnable)) {
 	 * 		var clz = Clazz.evalType (b);
 	 * 		c.setClazz (clz);
 	 * 	}
-	 * 	c.run ();
+	 * 	if (c != null) c.run ();
 	 * }, false, true);
 	 */
 	static void objectLoad(Object display, final String clazzName, final Runnable afterLoaded) {
 		((Display) display).asyncExec(new Runnable() {
 			public void run() {
 				try {
-					Class clz = Class.forName(clazzName);
-					if (afterLoaded instanceof ARunnable) {
+					Class clz = Class.forName(clazzName); // May freeze UI!
+					if (afterLoaded != null && afterLoaded instanceof ARunnable) {
 						ARunnable runnable = (ARunnable) afterLoaded;
 						runnable.setClazz(clz);
 					}
@@ -112,7 +112,7 @@ public void run() {
 					return ;
 				}
 				
-				afterLoaded.run();
+				if (afterLoaded != null) afterLoaded.run();
 			}
 		});
 	}
