Fixing bug that Display#timerExec adds all timer Runnable object into list without clearing them

zhourenjian · zhourenjian · commit 6bde7ffc05b8 · 2009-04-29T15:31:22.000Z
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Console.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Console.java
@@ -82,7 +82,6 @@ public void run() {
 						Element wrapperEl = console.consoleWrapper.handle;
 						wrapperEl.scrollLeft = scrollOffset.x;
 						wrapperEl.scrollTop = scrollOffset.y;
-				
 					}
 				
 				});
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Display.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Display.java
@@ -3290,11 +3290,21 @@ public boolean post (Event event) {
 			*/
 		}
 	} 
+	/**
+	 * @j2sNative
+	 * window.setTimeout (function (disp) {
+	 * 	return function () {
+	 * 		disp.runDeferredEvents ();
+	 * 	};
+	 * } (this), 1);
+	 */ {}
+	/*
 	timerExec(1, new Runnable() {
 		public void run() {
 			runDeferredEvents();
 		}
 	});
+	*/
 	return false;
 }
 
@@ -3318,11 +3328,21 @@ void postEvent (Event event) {
 		eventQueue = newQueue;
 	}
 	eventQueue [index] = event;
+	/**
+	 * @j2sNative
+	 * window.setTimeout (function (disp) {
+	 * 	return function () {
+	 * 		disp.runDeferredEvents ();
+	 * 	};
+	 * } (this), 1);
+	 */ {}
+	/*
 	timerExec(1, new Runnable() {
 		public void run() {
 			runDeferredEvents();
 		}
 	});
+	*/
 }
 
 /**
@@ -4034,6 +4054,7 @@ boolean runPopups () {
 	return result;
 }
 
+/*
 boolean runTimer (int id) {
 	if (timerList != null && timerIds != null) {
 		int index = 0;
@@ -4052,6 +4073,7 @@ boolean runTimer (int id) {
 	}
 	return false;
 }
+*/
 
 void sendEvent (int eventType, Event event) {
 	if (eventTable == null && filterTable == null) {
@@ -4396,9 +4418,9 @@ public void timerExec (int milliseconds, Runnable runnable) {
 	int timerId = 0;
 	if (index != timerList.length) {
 		timerId = timerIds [index];
-		if (milliseconds < 0) {			
+		if (milliseconds < 0 && timerIds [index] != 0) {			
 			//OS.KillTimer (hwndMessage, timerId);
-			window.clearInterval(timerId);
+			window.clearTimeout(timerId);
 			timerList [index] = null;
 			timerIds [index] = 0;
 			return;
@@ -4422,7 +4444,21 @@ public void timerExec (int milliseconds, Runnable runnable) {
 		}
 	}
 	//int newTimerID = OS.SetTimer (hwndMessage, timerId, milliseconds, 0);
-	int newTimerID = window.setTimeout(Clazz.makeFunction(runnable), milliseconds);
+	Runnable fun = null;
+	/**
+	 * @j2sNative
+	 * fun = (function (jsr, idx, disp) {
+	 * 	return function () {
+	 * 		try {
+	 * 			jsr.run ();
+	 * 		} finally {
+	 * 			disp.timerList[idx] = null;
+	 * 			disp.timerIds[idx] = 0;
+	 * 		}
+	 * 	};
+	 * }) (runnable, index, this);
+	 */ {}
+	int newTimerID = window.setTimeout(fun, milliseconds);
 	if (newTimerID != 0) {
 		timerList [index] = runnable;
 		timerIds [index] = newTimerID;
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Link.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Link.java
@@ -331,9 +331,7 @@ public void run() {
 			e.widget = Link.this;
 			e.display = display;
 			sendEvent(SWT.Selection);
-			if (!e.doit) {
-				toReturn(false);
-			}
+			toReturn(false);
 		}
 	};
 	for (int i = 0; i < anchors.length; i++) {

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,6 @@ public void run() {`
`82`	`82`	`Element wrapperEl = console.consoleWrapper.handle;`
`83`	`83`	`wrapperEl.scrollLeft = scrollOffset.x;`
`84`	`84`	`wrapperEl.scrollTop = scrollOffset.y;`
`85`		`-`
`86`	`85`	`}`
`87`	`86`
`88`	`87`	`});`