xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #1790 Bug fixes for SCAN.

Browse source 
Change-Id: I5743cd94be6c06808acb0add38d63ea381d13c65

Former-commit-id: 2bb23a6015638266ed17034777489c9ec6dc1307
This commit is contained in:
Roger Ferrel 2013-03-28 09:16:24 -05:00
parent 9a321b6ac8
commit 9c560ab626
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/fffg/FFFGDlg.java
View file

@ -89,6 +89,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* Changes for non-blocking HelpDlg.
* Changes for non-blocking RetrieveMergeDlg.
* Changes for non-blocking LoadSaveDeleteSelectDlg.
* Mar 28, 2013 #1790 rferrel Bug fix for non-blocking dialogs.
*
* </pre>
*
@ -1622,8 +1623,10 @@ public class FFFGDlg extends CaveSWTDialog implements ISourceCompAction,
retMergeDlg = null;
}
});
retMergeDlg.open();
} else {
retMergeDlg.bringToTop();
}
retMergeDlg.open();
}
}
@ -1774,30 +1777,36 @@ public class FFFGDlg extends CaveSWTDialog implements ISourceCompAction,
* Help menu popup.
*/
private void callHelpDlg() {
if (helpDlg == null) {
if (helpDlg == null || helpDlg.isDisposed()) {
helpDlg = new HelpDlg(shell);
helpDlg.open();
} else {
helpDlg.bringToTop();
}
helpDlg.open();
}
/*
* About menu popup
*/
private void callAboutDlg() {
if (aboutDlg == null) {
if (aboutDlg == null || aboutDlg.isDisposed()) {
aboutDlg = new AboutDlg(shell);
aboutDlg.open();
} else {
aboutDlg.bringToTop();
}
aboutDlg.open();
}
/*
* Acknowledgments menu popup
*/
private void callAcknowledgmentsDlg() {
if (acknowledgmentsDlg == null) {
if (acknowledgmentsDlg == null || acknowledgmentsDlg.isDisposed()) {
acknowledgmentsDlg = new AcknowledgmentsDlg(shell);
acknowledgmentsDlg.open();
} else {
acknowledgmentsDlg.bringToTop();
}
acknowledgmentsDlg.open();
}
/**

11
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/actions/FFTIAction.java
View file

@ -39,6 +39,7 @@ import com.raytheon.uf.viz.monitor.ffmp.ffti.FFTIControlDlg;
* ------------ ---------- ----------- --------------------------
* 1/27/10 4265 dhladky Initial Creation.
* 12/05/2012 1353 rferrel Changes for non-blocking FFTIControlDlg.
* 03/28/2013 1790 rferrel Bug fix for non-blocking dialogs.
*
* </pre>
*
@ -55,14 +56,12 @@ public class FFTIAction extends AbstractHandler {
.getShell();
shell.setCursor(shell.getDisplay().getSystemCursor(SWT.CURSOR_WAIT));
// Must create new dialog when old is closed instead of just opening the
// old dialog again. This will restore the dialog to the last saved
// changes.
if (fftiControlDlg == null || fftiControlDlg.getShell() == null
|| fftiControlDlg.isDisposed()) {
if (fftiControlDlg == null || fftiControlDlg.isDisposed()) {
fftiControlDlg = new FFTIControlDlg(shell);
fftiControlDlg.open();
} else {
fftiControlDlg.bringToTop();
}
fftiControlDlg.open();
shell.setCursor(null);
return null;
}