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

Merge "Issue #1298 Changes for non-blocking TEWxSetValueDialog." into development

Browse source 
Former-commit-id: 8fa3d794fd [formerly eceb7bed3794368ebb0cd57e466e7beaee88a19d]
Former-commit-id: edfab7e56f
This commit is contained in:
Lee Venable 2012-11-14 16:05:20 -06:00 • committed by Gerrit Code Review
commit bbba9b1b29
2 changed files with 9 additions and 6 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/SetWeatherAction.java
View file

@ -36,6 +36,7 @@ import com.raytheon.viz.gfe.temporaleditor.dialogs.TEWxSetValueDialog;
* Date Ticket# Engineer Description
* ------------ ---------- ------------- --------------------------
* May 28, 2009 #2159 Richard Peter Initial Creation.
* Nov 13, 2012 #1298 rferrel Changes for non-blocking TEWxSetValueDialog.
* </pre>
*
* @author rjpeter
@ -54,9 +55,12 @@ public class SetWeatherAction 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.
TEWxSetValueDialog weatherPickupValueDialog = new TEWxSetValueDialog(
Display.getCurrent().getActiveShell(), parm, date);
weatherPickupValueDialog.setBlockOnOpen(true);
weatherPickupValueDialog.setBlockOnOpen(false);
weatherPickupValueDialog.open();
}
}

9
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/temporaleditor/dialogs/TEWxSetValueDialog.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 13, 2012 #1298 rferrel Code clean up for non-blocking dialog.
*
* </pre>
*
@ -63,7 +62,8 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
*/
public class TEWxSetValueDialog extends CaveJFACEDialog {
private static final transient IUFStatusHandler statusHandler = UFStatus.getHandler(TEWxSetValueDialog.class);
private final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(TEWxSetValueDialog.class);
private Parm parm;
@ -197,8 +197,7 @@ public class TEWxSetValueDialog 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();