Support blocking of SWT.Dialog#open

jossonsmith · jossonsmith · commit ddacb006b1c5 · 2006-10-14T13:36:56.000Z
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Dialog.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Dialog.java
@@ -14,10 +14,8 @@
 import org.eclipse.swt.*;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.internal.ResizeSystem;
-import org.eclipse.swt.internal.xhtml.document;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 
@@ -45,13 +43,23 @@
  *	public Object open () {
  *		Shell parent = getParent();
  *		Shell shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
+ *		// remove following "-"
+ *		/-**
+ *		 * @-j2sNative
+ *		 * this.dialogShell = shell;
+ *		 *-/ {}
  *		shell.setText(getText());
  *		// Your code goes here (widget creation, set result, etc).
  *		shell.open();
  *		Display display = parent.getDisplay();
  *		while (!shell.isDisposed()) {
  *			if (!display.readAndDispatch()) display.sleep();
  *		}
+ *		// remove following "-"
+ *		/-**
+ *		 * @-j2sNative
+ *		 * this.dialogReturn = this.result;
+ *		 *-/ {}
  *		return result;
  *	}
  * }
@@ -79,12 +87,44 @@
  * </p>
  * 
  * @see Shell
+ * @j2sSuffix
+DialogSync2Async = {};
+DialogSync2Async.block = function (dialog, oThis, runnable) {
+if (dialog == null) return;
+dialog.open();
+var shell = dialog.dialogShell;
+if (shell == null) return; 
+shell.addDisposeListener ((function (innerThis, finalVars) {
+if (!Clazz.isClassDefined ("DialogSync2Async$1")) {
+Clazz.pu$h ();
+cla$$ = DialogSync2Async$1 = function () {
+Clazz.prepareCallback (this, arguments);
+Clazz.instantialize (this, arguments);
+};
+Clazz.decorateAsType (cla$$, "DialogSync2Async$1", null, $wt.events.DisposeListener);
+Clazz.defineMethod (cla$$, "widgetDisposed", 
+function (e) {
+var $runnable = this.f$.runnable;
+var $oThis = this.f$.oThis;
+window.setTimeout (function () {
+$runnable.apply ($oThis);
+}, 0);
+//this.f$.runnable.apply (this.f$.oThis);
+}, "$wt.events.DisposeEvent");
+cla$$ = Clazz.p0p ();
+}
+return Clazz.innerTypeInstance (DialogSync2Async$1, innerThis, finalVars);
+}) (this, Clazz.cloneFinals ("runnable", runnable, "oThis", oThis)));
+shell.getDisplay ().readAndDispatch ();
+};
  */
 
 public abstract class Dialog {
 	int style;
 	Shell parent;
 	String title;
+	Shell dialogShell;
+	Object dialogReturn;
 
 /**
  * Constructs a new instance of this class given only its
@@ -257,7 +297,7 @@ public void setText (String string) {
 
 
 protected void dialogUnimplemented() {
-	final Shell dialogShell = new Shell(parent.display, style | SWT.CLOSE | SWT.BORDER);
+	dialogShell = new Shell(parent.display, style | SWT.CLOSE | SWT.BORDER | SWT.SHELL_TRIM);
 	dialogShell.addListener(SWT.Close, new Listener() {
 		public void handleEvent(Event event) {
 			//updateReturnCode();
@@ -267,7 +307,7 @@ public void handleEvent(Event event) {
 	dialogShell.setLayout(new GridLayout(2, false));
 
 	Label icon = new Label(dialogShell, SWT.NONE);
-	icon.setImage(new Image(dialogShell.display, "j2slib/images/warning.png"));
+	icon.setImage(parent.display.getSystemImage(SWT.ICON_WARNING));
 	GridData gridData = new GridData(32, 32);
 	icon.setLayoutData(gridData);
 	
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/MessageBox.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/MessageBox.java
@@ -47,7 +47,6 @@
 public  class MessageBox extends Dialog {
 	String message = "";
 	private Composite buttonPanel;
-	private Shell dialogShell;
 	private Button btn;
 	private int returnCode;
 	
@@ -207,7 +206,7 @@ public int open () {
 	}
 	*/
 	returnCode = -1;
-	dialogShell = new Shell(parent.display, style | SWT.CLOSE | SWT.BORDER);
+	dialogShell = new Shell(parent.display, style | SWT.CLOSE | SWT.BORDER | SWT.SHELL_TRIM);
 	dialogShell.addListener(SWT.Close, new Listener() {
 		public void handleEvent(Event event) {
 			updateReturnCode();
@@ -388,6 +387,10 @@ private void updateReturnCode() {
 		if ((style & (SWT.RETRY | SWT.CANCEL)) == (SWT.RETRY | SWT.CANCEL)) returnCode = SWT.CANCEL;
 		if ((style & (SWT.ABORT | SWT.RETRY | SWT.IGNORE)) == (SWT.ABORT | SWT.RETRY | SWT.IGNORE)) returnCode = SWT.IGNORE;
 	}
+	/**
+	 * @j2sNative
+	 * this.dialogReturn = this.returnCode;
+	 */{}
 }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@`
`47`	`47`	`public class MessageBox extends Dialog {`
`48`	`48`	`String message = "";`
`49`	`49`	`private Composite buttonPanel;`
`50`		`- private Shell dialogShell;`
`51`	`50`	`private Button btn;`
`52`	`51`	`private int returnCode;`
`53`	`52`
`@@ -207,7 +206,7 @@ public int open () {`
`207`	`206`	`}`
`208`	`207`	`*/`
`209`	`208`	`returnCode = -1;`
`210`		`- dialogShell = new Shell(parent.display, style \| SWT.CLOSE \| SWT.BORDER);`
	`209`	`+ dialogShell = new Shell(parent.display, style \| SWT.CLOSE \| SWT.BORDER \| SWT.SHELL_TRIM);`
`211`	`210`	`dialogShell.addListener(SWT.Close, new Listener() {`
`212`	`211`	`public void handleEvent(Event event) {`
`213`	`212`	`updateReturnCode();`
`@@ -388,6 +387,10 @@ private void updateReturnCode() {`
`388`	`387`	`if ((style & (SWT.RETRY \| SWT.CANCEL)) == (SWT.RETRY \| SWT.CANCEL)) returnCode = SWT.CANCEL;`
`389`	`388`	`if ((style & (SWT.ABORT \| SWT.RETRY \| SWT.IGNORE)) == (SWT.ABORT \| SWT.RETRY \| SWT.IGNORE)) returnCode = SWT.IGNORE;`
`390`	`389`	`}`
	`390`	`+ /**`
	`391`	`+ * @j2sNative`
	`392`	`+ * this.dialogReturn = this.returnCode;`
	`393`	`+ */{}`
`391`	`394`	`}`
`392`	`395`
`393`	`396`	`}`