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

Issue #1298 Changes for non-blocking WeatherElementBrowserDialog.

Browse source 
Change-Id: I3359b2b9f9bbf1e58735891163fa8fd798e4ac1e

Former-commit-id: f37d9edd9803c6a2bbf039662b3f2750b1cec8db
This commit is contained in:
Roger Ferrel 2012-10-30 09:00:10 -05:00
parent 10c8013cc3
commit 4a13cfb8a6
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowWeatherElementBrowserDialog.java
View file

@ -38,6 +38,7 @@ import com.raytheon.viz.gfe.dialogs.WeatherElementBrowserDialog;
* 02/22/2008 Eric Babin Initial Creation
* 04/09/2009 1288 rjpeter Removed explicit refresh of SpatialDisplayManager.
* 04/30/2009 2282 rjpeter Moved dialog handling to the dialog.
* 10/30/2012 1229 rferrel Changed for non-blocking WeatherElementBrowserDialog.
* </pre>
*
* @author ebabin
@ -45,6 +46,7 @@ import com.raytheon.viz.gfe.dialogs.WeatherElementBrowserDialog;
*/
public class ShowWeatherElementBrowserDialog extends AbstractHandler {
private WeatherElementBrowserDialog dialog;
/*
* (non-Javadoc)
@ -56,13 +58,18 @@ public class ShowWeatherElementBrowserDialog extends AbstractHandler {
@Override
public Object execute(ExecutionEvent arg0) throws ExecutionException {
DataManager dm = DataManager.getCurrentInstance();
if (dm != null) {
if (dm == null) {
return null;
}
if (dialog == null || dialog.getShell() == null || dialog.isDisposed()) {
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
.getShell();
WeatherElementBrowserDialog dialog = new WeatherElementBrowserDialog(
shell, dm);
dialog.setBlockOnOpen(true);
dialog = new WeatherElementBrowserDialog(shell, dm);
dialog.setBlockOnOpen(false);
dialog.open();
} else {
dialog.bringToTop();
}
return null;

5
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementBrowserDialog.java
View file

@ -72,6 +72,7 @@ import com.raytheon.viz.ui.widgets.ToggleSelectList;
* 09/12/2012 #1117 dgilling Revert previous changes, retrieve
* database list from ParmManager
* not EDEX.
* 10/30/2012 1298 rferrel Code clean up non-blocking dialog.
* </pre>
*
* @author ebabin
@ -109,9 +110,9 @@ public class WeatherElementBrowserDialog extends CaveJFACEDialog {
private ParmID[] currentDisplayedParms;
private static final Point size = new Point(603, 778);
private final Point size = new Point(603, 778);
private static final String IFP = "IFP";
private final String IFP = "IFP";
/**
* Constructor