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

Issue #1298 Changes for non-blocking TEDiscreteSetValueDialog.

Browse source 
Change-Id: I4e015b94f20b5075c4dc22d2165718d02109e0a8

Former-commit-id: bb0e054a90 [formerly a49ee93898] [formerly 62faa06ddf] [formerly 62faa06ddf [formerly e267248b57]] [formerly 2331b8e1f5 [formerly 62faa06ddf [formerly e267248b57] [formerly 2331b8e1f5 [formerly 5c0eef28a67b874f184fd391d9220957030e43c7]]]]
Former-commit-id: 2331b8e1f5
Former-commit-id: e7b57f854688df5cd2b31022688c6133cced2108 [formerly f3b0d96220d8990a788ce98360553eaaec46477f] [formerly ce623db367 [formerly 3f0dc83f89]]
Former-commit-id: ce623db367
Former-commit-id: 33cd82df5c
This commit is contained in:
Roger Ferrel 2012-11-14 14:00:11 -06:00
parent 31c3b2970b
commit 092304d0e0
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/temporaleditor/actions/SetDiscreteAction.java
View file

@ -36,6 +36,7 @@ import com.raytheon.viz.gfe.temporaleditor.dialogs.TEDiscreteSetValueDialog;
* Date Ticket# Engineer Description
* ------------ ---------- ------------- --------------------------
* May 28, 2009 #2159 Richard Peter Initial Creation.
* Nov 13, 2012 #1298 rferrel Changes for non-blocking TEDiscreteSetValueDialog.
* </pre>
*
* @author rjpeter
@ -54,9 +55,12 @@ public class SetDiscreteAction extends Action {
@Override
public void run() {
// The dialog being opened is modal to the parent dialog. This will
// prevent the launching of another dialog until the modal dialog is
// closed.
TEDiscreteSetValueDialog discretePickupValueDialog = new TEDiscreteSetValueDialog(
Display.getCurrent().getActiveShell(), parm, date);
discretePickupValueDialog.setBlockOnOpen(true);
discretePickupValueDialog.setBlockOnOpen(false);
discretePickupValueDialog.open();
}
}

12
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/temporaleditor/dialogs/TEDiscreteSetValueDialog.java
View file

@ -37,9 +37,7 @@ import com.raytheon.uf.common.dataplugin.gfe.grid.Grid2DBit;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.viz.gfe.Activator;
import com.raytheon.viz.gfe.GFEOperationFailedException;
import com.raytheon.viz.gfe.constants.StatusConstants;
import com.raytheon.viz.gfe.core.griddata.IGridData;
import com.raytheon.viz.gfe.core.parm.Parm;
import com.raytheon.viz.gfe.core.wxvalue.WxValue;
@ -55,6 +53,7 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jun 24, 2009 #1318 randerso Initial creation
* Nov 14, 2012 #1298 rferrel Changes for non-blocking dialog.
*
* </pre>
*
@ -63,7 +62,8 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
*/
public class TEDiscreteSetValueDialog extends CaveJFACEDialog {
private static final transient IUFStatusHandler statusHandler = UFStatus.getHandler(TEDiscreteSetValueDialog.class);
private final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(TEDiscreteSetValueDialog.class);
private Parm parm;
@ -144,9 +144,6 @@ public class TEDiscreteSetValueDialog extends CaveJFACEDialog {
layout.marginWidth = 0;
GridData layoutData = new GridData(SWT.FILL, SWT.DEFAULT, true, false);
// pnLabel = new Label(topFrame, SWT.CENTER);
// pnLabel.setText("No active weather element");
// pnLabel.setLayoutData(layoutData);
Composite valueFrame = new Composite(topFrame, SWT.NONE);
layout = new GridLayout(1, false);
@ -200,8 +197,7 @@ public class TEDiscreteSetValueDialog extends CaveJFACEDialog {
}
parm.endParmEdit();
} catch (GFEOperationFailedException exc) {
statusHandler.handle(Priority.PROBLEM,
"Grid edit failed", exc);
statusHandler.handle(Priority.PROBLEM, "Grid edit failed", exc);
}
super.okPressed();