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

Issue #1229 Changes for non-blocking DisplayPropertiesDialog.

Browse source 
Change-Id: If19a36fe150c85d92e85a56b931dc66ba9a251b3

Former-commit-id: a633a43f29 [formerly a495dee0c9] [formerly 566ce2d976 [formerly 3cf1be917057f6a3db71ae3b408e46ca1e972f11]]
Former-commit-id: 566ce2d976
Former-commit-id: 80c2beec21
This commit is contained in:
Roger Ferrel 2012-10-16 07:59:13 -05:00
parent 19797b9064
commit ea271fa511
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/DisplayPropertiesAction.java
View file

@ -35,6 +35,7 @@ import com.raytheon.viz.ui.tools.AbstractTool;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 8, 2009 bgonzale Initial creation
* Oct 15, 2012 1229 rferrel Changes for non-blocking DisplayPropertiesDialog.
*
* </pre>
*
@ -57,13 +58,12 @@ public class DisplayPropertiesAction extends AbstractTool {
public Object execute(ExecutionEvent arg0) throws ExecutionException {
super.execute(arg0);
if (dialog == null) {
if (dialog == null || dialog.getShell() == null || dialog.isDisposed()) {
dialog = new DisplayPropertiesDialog(VizWorkbenchManager
.getInstance().getCurrentWindow().getShell());
dialog.open();
dialog = null;
} else {
dialog.open();
dialog.bringToTop();
}
return null;

9
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/DisplayPropertiesDialog.java
View file

@ -54,11 +54,9 @@ import com.raytheon.uf.viz.core.rsc.IResourceGroup;
import com.raytheon.uf.viz.core.rsc.ResourceList;
import com.raytheon.uf.viz.core.rsc.capabilities.AbstractCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.OutlineCapability;
import com.raytheon.uf.viz.core.status.StatusConstants;
import com.raytheon.uf.viz.d2d.core.map.MapScales;
import com.raytheon.uf.viz.d2d.core.map.MapScales.MapScale;
import com.raytheon.uf.viz.d2d.core.time.LoadMode;
import com.raytheon.uf.viz.d2d.ui.Activator;
import com.raytheon.uf.viz.d2d.ui.DensityPopulator;
import com.raytheon.uf.viz.d2d.ui.MagnificationPopulator;
import com.raytheon.uf.viz.d2d.ui.actions.DensityHandler;
@ -78,6 +76,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 8, 2009 bgonzale Initial creation
* Oct 16, 2012 1229 rferrel Made dialog non-blocking.
*
* </pre>
*
@ -86,7 +85,8 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
*/
public class DisplayPropertiesDialog extends CaveSWTDialog {
private static final transient IUFStatusHandler statusHandler = UFStatus.getHandler(DisplayPropertiesDialog.class);
private final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(DisplayPropertiesDialog.class);
private Combo scale;
@ -171,7 +171,8 @@ public class DisplayPropertiesDialog extends CaveSWTDialog {
* @param editor
*/
public DisplayPropertiesDialog(Shell parentShell) {
super(parentShell, SWT.DIALOG_TRIM | SWT.MIN, CAVE.INDEPENDENT_SHELL);
super(parentShell, SWT.DIALOG_TRIM | SWT.MIN, CAVE.INDEPENDENT_SHELL
| CAVE.DO_NOT_BLOCK);
setText("Display Properties");
this.sHandler = new ScaleHandler();