diff --git a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/MessageStatusComp.java b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/MessageStatusComp.java index e3420544f5..c0e22e25d8 100644 --- a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/MessageStatusComp.java +++ b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/MessageStatusComp.java @@ -69,6 +69,7 @@ import com.raytheon.viz.avncommon.AvnMessageMgr.StatusMessageType; * 8/11/2008 1314 grichard Used PathManager for pathnames. * 10/04/2012 1229 rferrel Added dispose check needed for * non-blocking dialogs. + * 10/12/2012 1229 rferrel Changes for non-blocking MessageViewerDlg. * * * @@ -423,12 +424,12 @@ public class MessageStatusComp extends Composite implements IStatusSettable { * Create the message viewer dialog. */ private void createMessageViewerDialog() { - if (msgViewerDlg == null || msgViewerDlg.getShell().isDisposed()) { + if (msgViewerDlg == null || msgViewerDlg.getShell() == null + || msgViewerDlg.isDisposed()) { msgViewerDlg = new MessageViewerDlg(this, msgType); msgViewerDlg.open(); - msgViewerDlg = null; } else { - msgViewerDlg.showDialog(); + msgViewerDlg.bringToTop(); } } diff --git a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/MessageViewerDlg.java b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/MessageViewerDlg.java index 49030af359..ff9d6d22f3 100755 --- a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/MessageViewerDlg.java +++ b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/MessageViewerDlg.java @@ -47,6 +47,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog; * 28 FEB 2008 938 lvenable Initial creation. * 4/8/2008 934 grichard Added IStatusViewable interface. * 9/12/2008 1444 grichard Accommodate separate message logs. + * 10/12/2012 1229 rferrel Make dialog non-blocking. * * * @@ -81,7 +82,7 @@ public class MessageViewerDlg extends CaveSWTDialog { */ public MessageViewerDlg(Composite parent, StatusMessageType msgType) { super(parent.getShell(), SWT.DIALOG_TRIM | SWT.RESIZE | SWT.MODELESS, - CAVE.PERSPECTIVE_INDEPENDENT); + CAVE.PERSPECTIVE_INDEPENDENT | CAVE.DO_NOT_BLOCK); setText("Message Log"); this.msgType = msgType; @@ -178,16 +179,4 @@ public class MessageViewerDlg extends CaveSWTDialog { } msgList.setSelection(0); } - - /** - * Show the dialog. - */ - public void showDialog() { - - if (shell.isVisible() == false) { - shell.setVisible(true); - } - - shell.setActive(); - } }