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

Issue #1790 Bug fixes for ticket 1353.

Browse source 
Change-Id: I36b74546b7f73c669d65a5588e813173ccbd18fc

Former-commit-id: 04b57a8582 [formerly 04b57a8582 [formerly e0c3e3b81f679985a048047b3e5aa69992577d78]]
Former-commit-id: 391ce5687b
Former-commit-id: 726b5de0c5
This commit is contained in:
Roger Ferrel 2013-03-27 16:56:17 -05:00
parent d504643687
commit 1b74b2d4a4
4 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/alertalarm/AlertAlarmValuesAction.java
View file

@ -37,6 +37,7 @@ import org.eclipse.ui.PlatformUI;
* ------------ ---------- ----------- --------------------------
* 6/27/07 lvenable Initial creation.
* 12/05/12 1353 rferrel Changes for non-blocking AlertAlarmValuesDlg.
* 03/27/2013 1790 rferrel Bug fix for non-blocking dialogs.
*
* </pre>
*
@ -49,12 +50,14 @@ public class AlertAlarmValuesAction extends AbstractHandler {
@Override
public Object execute(ExecutionEvent arg0) throws ExecutionException {
if (alertAlarmDlg == null) {
if (alertAlarmDlg == null || alertAlarmDlg.isDisposed()) {
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
.getShell();
alertAlarmDlg = new AlertAlarmValuesDlg(shell);
}
alertAlarmDlg.open();
} else {
alertAlarmDlg.bringToTop();
}
return null;
}

15
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/appsdefaults/AppsDefaultsAction.java
View file

@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
/**
* TODO Add Description
* Action to display the Get Apps Defaults or SHEF Apps Defaults dialog.
*
* <pre>
*
@ -37,6 +37,7 @@ import org.eclipse.ui.PlatformUI;
* Jan 26, 2011 mpduff Initial creation
* Dec 06, 2012 1353 rferrel Changes for non blocking GetAppsDefaults.
* Changes for non blocking SHEFAppsDefaultsDlg.
* Mar 27, 2013 1790 rferrel Bug fix for non-blocking dialogs.
*
* </pre>
*
@ -62,15 +63,19 @@ public class AppsDefaultsAction extends AbstractHandler {
.getShell();
String action = event.getParameter("Action");
if (action.equals("gad")) {
if (gad == null) {
if (gad == null || gad.isDisposed()) {
gad = new GetAppsDefaults(shell);
}
gad.open();
} else {
if (dlg == null) {
dlg = new SHEFAppsDefaultsDlg(shell);
gad.bringToTop();
}
} else {
if (dlg == null || dlg.isDisposed()) {
dlg = new SHEFAppsDefaultsDlg(shell);
dlg.open();
} else {
dlg.bringToTop();
}
}
return null;
}

9
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/bestestimateqpe/BestEstimateQpeAction.java
View file

@ -40,7 +40,8 @@ import org.eclipse.ui.PlatformUI;
* ------------ ---------- ----------- --------------------------
* 6/27/06 randerso Initial Creation.
* 8/24/2009 2258 mpduff Removed not implemented message.
* 12/05/1212 1363 rferrel Changes for non-blocking BestEstimateQpeDlg.
* 12/05/2012 1363 rferrel Changes for non-blocking BestEstimateQpeDlg.
* 03/27/2013 1790 rferrel Bug fix for non-blocking dialogs.
*
* </pre>
*
@ -52,12 +53,14 @@ public class BestEstimateQpeAction extends AbstractHandler {
@Override
public Object execute(ExecutionEvent arg0) throws ExecutionException {
if (bestEstimateDlg == null) {
if (bestEstimateDlg == null || bestEstimateDlg.isDisposed()) {
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
.getShell();
bestEstimateDlg = new BestEstimateQpeDlg(shell);
}
bestEstimateDlg.open();
} else {
bestEstimateDlg.bringToTop();
}
return null;
}

7
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/damdisplay/DamDisplayAction.java
View file

@ -40,6 +40,7 @@ import org.eclipse.ui.PlatformUI;
* ------------ ---------- ----------- --------------------------
* 6/27/06 randerso Initial Creation.
* 12/10/2013 1353 rferrel Changes for non-blocking DamDisplayControlDlg.
* 03/27/2013 1790 rferrel Bug fix for non-blocking dialogs.
*
* </pre>
*
@ -58,12 +59,14 @@ public class DamDisplayAction extends AbstractHandler {
*/
@Override
public Object execute(ExecutionEvent arg0) throws ExecutionException {
if (damDisplayDlg == null) {
if (damDisplayDlg == null || damDisplayDlg.isDisposed()) {
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
.getShell();
damDisplayDlg = new DamDisplayControlDlg(shell);
}
damDisplayDlg.open();
} else {
damDisplayDlg.bringToTop();
}
return null;
}