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

Issue #1287 Changes for non-blocking SiteActivationDlg.

Browse source 
Change-Id: Id059058fda486b57df5d461f3c9eb13981f7f744

Former-commit-id: 2ab4a8508a [formerly ae1185cb5825915820314fdc48c897676ead8538]
Former-commit-id: 8c5b00fa42
This commit is contained in:
Roger Ferrel 2012-10-26 14:10:58 -05:00
parent d7c043dffa
commit b345d95b4d
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ActivateSiteComponent.java
View file

@ -26,7 +26,7 @@ import com.raytheon.viz.gfe.dialogs.sbu.SiteActivationDlg;
import com.raytheon.viz.ui.personalities.awips.AbstractCAVEComponent;
/**
* TODO Add Description
* Display Activate Site dialog standalone and blocked.
*
* <pre>
*
@ -35,6 +35,7 @@ import com.raytheon.viz.ui.personalities.awips.AbstractCAVEComponent;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Aug 15, 2011 bphillip Initial creation
* Oct 26, 2012 1287 rferrel Force blocking of SiteActivationDlg.
*
* </pre>
*
@ -55,6 +56,7 @@ public class ActivateSiteComponent extends AbstractCAVEComponent {
protected void startInternal(String componentName) throws Exception {
SiteActivationDlg dlg = new SiteActivationDlg(new Shell(
Display.getCurrent()));
dlg.setBlockOnOpen(true);
dlg.open();
}

16
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowSiteActivationDlg.java
View file

@ -37,6 +37,7 @@ import com.raytheon.viz.gfe.dialogs.sbu.SiteActivationDlg;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Aug 5, 2011 randerso Initial creation
* Oct 26, 2012 1287 rferrel Changes for non-blocking SiteActivationDlg.
*
* </pre>
*
@ -45,6 +46,7 @@ import com.raytheon.viz.gfe.dialogs.sbu.SiteActivationDlg;
*/
public class ShowSiteActivationDlg extends AbstractHandler {
private SiteActivationDlg dialog;
/*
* (non-Javadoc)
@ -55,12 +57,16 @@ public class ShowSiteActivationDlg extends AbstractHandler {
*/
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
.getShell();
if (dialog == null || dialog.getShell() == null || dialog.isDisposed()) {
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
.getShell();
SiteActivationDlg dialog = new SiteActivationDlg(shell);
dialog.setBlockOnOpen(true);
dialog.open();
dialog = new SiteActivationDlg(shell);
dialog.setBlockOnOpen(false);
dialog.open();
} else {
dialog.bringToTop();
}
return null;
}

4
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/SiteActivationDlg.java
View file

@ -56,7 +56,6 @@ import com.raytheon.uf.viz.core.notification.NotificationException;
import com.raytheon.uf.viz.core.notification.NotificationMessage;
import com.raytheon.uf.viz.core.notification.jobs.NotificationManagerJob;
import com.raytheon.uf.viz.core.requests.ThriftClient;
import com.raytheon.viz.gfe.core.internal.IFPClient;
import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
/**
@ -69,6 +68,7 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Aug 5, 2011 randerso Initial creation
* Oct 26, 2012 1287 rferrel Code clean up for non-blocking dialog.
*
* </pre>
*
@ -79,7 +79,7 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
public class SiteActivationDlg extends CaveJFACEDialog implements
INotificationObserver {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(IFPClient.class);
.getHandler(SiteActivationDlg.class);
private SimpleDateFormat dateFormat;