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

Issue #1229 Changes for non-blocking CaveSWTWizardDlg.

Browse source 
Change-Id: I2ce93910b6605e5527c321f594bd0a03b13f321d

Former-commit-id: 9a5a87635a [formerly ae3fb5eef5] [formerly 9a5a87635a [formerly ae3fb5eef5] [formerly 314af882c6 [formerly 30b387dc4c5392263ba3e82bca1db64099684ecf]]]
Former-commit-id: 314af882c6
Former-commit-id: d7fe430a7e [formerly 39b1fcbb01]
Former-commit-id: 729a2b227c
This commit is contained in:
Roger Ferrel 2012-10-22 14:07:18 -05:00
parent 7c38a3f040
commit b0dd9d2d6b
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cave/com.raytheon.uf.viz.derivparam.ui/src/com/raytheon/uf/viz/derivparam/ui/actions/NewDerivedParameterAction.java
View file

@ -36,6 +36,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTWizardDlg;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Dec 14, 2010 mschenke Initial creation
* Oct 22, 2012 1229 rferrel Changes for non-blocking CaveSWTWizardDlg.
*
* </pre>
*
@ -44,6 +45,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTWizardDlg;
*/
public class NewDerivedParameterAction extends Action {
private CaveSWTWizardDlg dialog;
/**
*
@ -55,9 +57,13 @@ public class NewDerivedParameterAction extends Action {
@Override
public void run() {
DerivedParamWizard wizard = new DerivedParamWizard();
CaveSWTWizardDlg dialog = new CaveSWTWizardDlg(VizWorkbenchManager
.getInstance().getCurrentWindow().getShell(), wizard);
dialog.open();
if (dialog == null || dialog.getShell() == null || dialog.isDisposed()) {
dialog = new CaveSWTWizardDlg(VizWorkbenchManager.getInstance()
.getCurrentWindow().getShell(), wizard);
dialog.open();
} else {
dialog.bringToTop();
}
}
}

3
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/CaveSWTWizardDlg.java
View file

@ -46,6 +46,7 @@ import org.eclipse.swt.widgets.Shell;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Dec 19, 2010 lvenable Initial creation
* Oct 22, 2012 1229 rferrel Dialog changed to non-blocking.
*
* </pre>
*
@ -75,7 +76,7 @@ public class CaveSWTWizardDlg extends CaveSWTDialog {
private ArrayList<Composite> pageCompArray;
public CaveSWTWizardDlg(Shell parent, CaveSWTWizard swtWizzard) {
super(parent, SWT.APPLICATION_MODAL | SWT.MIN);
super(parent, SWT.APPLICATION_MODAL | SWT.MIN, CAVE.DO_NOT_BLOCK);
this.swtWizzard = swtWizzard;
if (swtWizzard.getTitle() != null) {
setText(swtWizzard.getTitle());