1. Now SimpleRPCRunnable class is not implementing interface of Runnable.

zhourenjian · zhourenjian · commit e9a82bfdc554 · 2007-03-15T14:33:37.000Z
2. Only wrap SimpleRPCRunnable#ajaxRun in Thread instead of Display#asyncRun
3. Update author name in comments.
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
@@ -20,7 +20,7 @@
  * A callback object is provided for action to be executed after the class is
  * loaded.
  * 
- * @author josson smith
+ * @author zhou renjian
  *
  * 2006-8-4
  */
diff --git a/sources/net.sf.j2s.ajax/ajaxcore/net/sf/j2s/ajax/ARunnable.java b/sources/net.sf.j2s.ajax/ajaxcore/net/sf/j2s/ajax/ARunnable.java
@@ -18,7 +18,7 @@
  * give convenience for <code>AClass</code> or <code>ASWTClass</code>
  * to set and to get the class that is loaded.
  *  
- * @author josson smith
+ * @author zhou renjian
  *
  * 2006-8-4
  */
diff --git a/sources/net.sf.j2s.ajax/ajaxcore/net/sf/j2s/ajax/HttpRequest.java b/sources/net.sf.j2s.ajax/ajaxcore/net/sf/j2s/ajax/HttpRequest.java
@@ -38,7 +38,7 @@
  * This class can be considered as a bridge of Java's AJAX programming and
  * JavaScript/Browser's AJAX programming.
  * 
- * @author josson smith
+ * @author zhou renjian
  *
  * 2006-2-11
  */
diff --git a/sources/net.sf.j2s.ajax/ajaxcore/net/sf/j2s/ajax/IXHRCallback.java b/sources/net.sf.j2s.ajax/ajaxcore/net/sf/j2s/ajax/IXHRCallback.java
@@ -30,7 +30,7 @@
  *    4 Loaded<br>
  *        The data transfer has been completed.<br> 
  * 
- * @author josson smith
+ * @author zhou renjian
  *
  * 2006-2-11
  */
diff --git a/sources/net.sf.j2s.ajax/ajaxcore/net/sf/j2s/ajax/XHRCallbackAdapter.java b/sources/net.sf.j2s.ajax/ajaxcore/net/sf/j2s/ajax/XHRCallbackAdapter.java
@@ -16,7 +16,7 @@
 /**
  * This adapter provides a default implementation of IXHRCallback.
  * 
- * @author josson smith
+ * @author zhou renjian
  *
  * 2006-2-11
  */
diff --git a/sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleRPCRequest.java b/sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleRPCRequest.java
@@ -17,7 +17,7 @@
 import java.net.URLEncoder;
 
 /**
- * @author josson smith
+ * @author zhou renjian
  *
  * 2006-10-10
  */
@@ -47,10 +47,21 @@ public static void switchToLocalJavaThreadMode() {
 	 * runnable.ajaxIn ();
 	 * net.sf.j2s.ajax.SimpleRPCRequest.ajaxRequest (runnable);
 	 */
-	public static void request(SimpleRPCRunnable runnable) {
+	public static void request(final SimpleRPCRunnable runnable) {
 		runnable.ajaxIn();
 		if (runningMode == MODE_LOCAL_JAVA_THREAD) {
-			new Thread(runnable).start();
+			new Thread(new Runnable() {
+				public void run() {
+					try {
+						runnable.ajaxRun();
+					} catch (RuntimeException e) {
+						e.printStackTrace(); // should never fail in Java thread mode!
+						runnable.ajaxFail();
+						return;
+					}
+					runnable.ajaxOut();
+				}
+			}).start();
 		} else {
 			ajaxRequest(runnable);
 		}
diff --git a/sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleRPCRunnable.java b/sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleRPCRunnable.java
@@ -19,7 +19,7 @@
  *
  * 2006-10-10
  */
-public abstract class SimpleRPCRunnable extends SimpleSerializable implements Runnable {
+public abstract class SimpleRPCRunnable extends SimpleSerializable {
 	
 	public String getHttpURL() {
 		return "simplerpc"; // url is relative to the servlet!
@@ -51,19 +51,4 @@ public String getHttpMethod() {
 	 */
 	public void ajaxFail() {};
 	
-	/**
-	 * @j2sNative
-	 * net.sf.j2s.ajax.ServletThread.call(this);
-	 */
-	public void run() {
-		// ajaxIn(); // ajaxIn should be run outside of #run directly
-		try {
-			ajaxRun();
-		} catch (RuntimeException e) {
-			e.printStackTrace(); // should never fail in Java thread mode!
-			ajaxFail();
-			return;
-		}
-		ajaxOut();
-	}
 }
diff --git a/sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleRPCSWTRequest.java b/sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleRPCSWTRequest.java
@@ -18,7 +18,7 @@
 import org.eclipse.swt.widgets.Display;
 
 /**
- * @author josson smith
+ * @author zhou renjian
  *
  * 2006-10-10
  */
@@ -29,10 +29,35 @@ public class SimpleRPCSWTRequest extends SimpleRPCRequest {
 	 * runnable.ajaxIn ();
 	 * net.sf.j2s.ajax.SimpleRPCRequest.ajaxRequest (runnable);
 	 */
-	public static void swtRequest(SimpleRPCRunnable runnable) {
+	public static void swtRequest(final SimpleRPCRunnable runnable) {
 		runnable.ajaxIn();
 		if (runningMode == MODE_LOCAL_JAVA_THREAD) {
-			Display.getDefault().asyncExec(runnable);
+			new Thread(new Runnable(){
+				public void run() {
+					try {
+						runnable.ajaxRun();
+					} catch (RuntimeException e) {
+						e.printStackTrace(); // should never fail in Java thread mode!
+						Display disp = Display.getDefault();
+						if (disp != null) {
+							disp.syncExec(new Runnable() {
+								public void run() {
+									runnable.ajaxFail();
+								}
+							});
+						}
+						return;
+					}
+					Display disp = Display.getDefault();
+					if (disp != null) {
+						disp.syncExec(new Runnable() {
+							public void run() {
+								runnable.ajaxOut();
+							}
+						});
+					}
+				}
+			}).start();
 		} else {
 			swtAJAXRequest(runnable);
 		}
diff --git a/sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleSerializable.java b/sources/net.sf.j2s.ajax/ajaxrpc/net/sf/j2s/ajax/SimpleSerializable.java
@@ -22,7 +22,7 @@
 import java.util.Set;
 
 /**
- * @author josson smith
+ * @author zhou renjian
  *
  * 2006-10-11
  */
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
@@ -33,7 +33,7 @@ public void run() {
  * parameter as <code>AClass#load</code>. Or call <code>ASWTClass#shellLoad</code>
  * or <code>ASWTClass#displayLoad</code> with extra Shell/Display argument. 
  * 
- * @author josson smith
+ * @author zhou renjian
  *
  * 2006-8-4
  */
diff --git a/sources/net.sf.j2s.ajax/ajaxswt/net/sf/j2s/ajax/XHRCallbackSWTAdapter.java b/sources/net.sf.j2s.ajax/ajaxswt/net/sf/j2s/ajax/XHRCallbackSWTAdapter.java
@@ -21,7 +21,7 @@
  * This adapter class provides a default implementation of IXHRCallback.
  * This adapter class wraps current thread scope for those swtOnXXXX method. 
  * 
- * @author josson smith
+ * @author zhou renjian
  *
  * 2006-2-11
  */
diff --git a/sources/net.sf.j2s.ajax/src/net/sf/j2s/ajax/AJAXVariableInitializer.java b/sources/net.sf.j2s.ajax/src/net/sf/j2s/ajax/AJAXVariableInitializer.java
@@ -30,7 +30,7 @@
 import org.eclipse.jdt.internal.launching.LaunchingPlugin;
 
 /**
- * @author josson smith
+ * @author zhou renjian
  *
  * 2006-6-5
  */

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`* A callback object is provided for action to be executed after the class is`
`21`	`21`	`* loaded.`
`22`	`22`	`*`
`23`		`- * @author josson smith`
	`23`	`+ * @author zhou renjian`
`24`	`24`	`*`
`25`	`25`	`* 2006-8-4`
`26`	`26`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`* give convenience for <code>AClass</code> or <code>ASWTClass</code>`
`19`	`19`	`* to set and to get the class that is loaded.`
`20`	`20`	`*`
`21`		`- * @author josson smith`
	`21`	`+ * @author zhou renjian`
`22`	`22`	`*`
`23`	`23`	`* 2006-8-4`
`24`	`24`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`* This class can be considered as a bridge of Java's AJAX programming and`
`39`	`39`	`* JavaScript/Browser's AJAX programming.`
`40`	`40`	`*`
`41`		`- * @author josson smith`
	`41`	`+ * @author zhou renjian`
`42`	`42`	`*`
`43`	`43`	`* 2006-2-11`
`44`	`44`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`* 4 Loaded<br>`
`31`	`31`	`* The data transfer has been completed.<br>`
`32`	`32`	`*`
`33`		`- * @author josson smith`
	`33`	`+ * @author zhou renjian`
`34`	`34`	`*`
`35`	`35`	`* 2006-2-11`
`36`	`36`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`/**`
`17`	`17`	`* This adapter provides a default implementation of IXHRCallback.`
`18`	`18`	`*`
`19`		`- * @author josson smith`
	`19`	`+ * @author zhou renjian`
`20`	`20`	`*`
`21`	`21`	`* 2006-2-11`
`22`	`22`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`import java.util.Set;`
`23`	`23`
`24`	`24`	`/**`
`25`		`- * @author josson smith`
	`25`	`+ * @author zhou renjian`
`26`	`26`	`*`
`27`	`27`	`* 2006-10-11`
`28`	`28`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public void run() {`
`33`	`33`	`* parameter as <code>AClass#load</code>. Or call <code>ASWTClass#shellLoad</code>`
`34`	`34`	`* or <code>ASWTClass#displayLoad</code> with extra Shell/Display argument.`
`35`	`35`	`*`
`36`		`- * @author josson smith`
	`36`	`+ * @author zhou renjian`
`37`	`37`	`*`
`38`	`38`	`* 2006-8-4`
`39`	`39`	`*/`