From f48d571cb6e3d4a8435d10662c56262b8f848a05 Mon Sep 17 00:00:00 2001 From: Lee Venable Date: Mon, 5 May 2014 16:12:24 -0500 Subject: [PATCH] Issue #3109 - removed code that sets the Cave cursor. Change-Id: I1d6d640c5abafffdea29f1e2e835142fe6598470 Former-commit-id: a6c2260dd14a7d6d351229bd41c72b7241b67389 [formerly a6c2260dd14a7d6d351229bd41c72b7241b67389 [formerly d875f73ff44986b2c7862f0dee06504d576fd96b]] Former-commit-id: b0a251f4e39ab6cc459c7e08f87bbea54bdf1b8b Former-commit-id: 631a8d3cb164e759c50e2c31d3fd28fb6488d6e6 --- .../uf/viz/monitor/ffmp/fffg/FFFGDlg.java | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/fffg/FFFGDlg.java b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/fffg/FFFGDlg.java index 3eb5d8d52f..32de4c553f 100644 --- a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/fffg/FFFGDlg.java +++ b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/fffg/FFFGDlg.java @@ -91,6 +91,8 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback; * Changes for non-blocking LoadSaveDeleteSelectDlg. * Mar 28, 2013 #1790 rferrel Bug fix for non-blocking dialogs. * Apr, 15, 2013 #1911 dhladky dialog wouldn't open every time to retrieve file. + * May 05, 2014 #3109 lvenable Removed code that sets the cursor on Cave because it doesn't need + * to be set. * * * @@ -310,8 +312,7 @@ public class FFFGDlg extends CaveSWTDialog implements ISourceCompAction, public FFFGDlg(Shell parentShell) { super(parentShell, SWT.DIALOG_TRIM, CAVE.INDEPENDENT_SHELL | CAVE.DO_NOT_BLOCK); - this.getParent().setCursor( - this.getParent().getDisplay().getSystemCursor(SWT.CURSOR_WAIT)); + setText("Forced Flash Flood Guidance"); sourceCompArray = new ArrayList(); @@ -808,15 +809,9 @@ public class FFFGDlg extends CaveSWTDialog implements ISourceCompAction, applyBtn.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - getParent().setCursor( - getParent().getDisplay().getSystemCursor( - SWT.CURSOR_WAIT)); shell.setCursor(getDisplay().getSystemCursor(SWT.CURSOR_WAIT)); applyDataAction(); updateFileStatusLabel(false); - getParent().setCursor( - getParent().getDisplay().getSystemCursor( - SWT.CURSOR_ARROW)); shell.setCursor(getDisplay().getSystemCursor(SWT.CURSOR_ARROW)); saveFileAs(); @@ -886,6 +881,7 @@ public class FFFGDlg extends CaveSWTDialog implements ISourceCompAction, * -1 = error, 0 = information message * @param message */ + @Override public void setStatusMsg(int status, String message) { if (message == null) { statusLbl.setText(""); @@ -1609,8 +1605,8 @@ public class FFFGDlg extends CaveSWTDialog implements ISourceCompAction, } if (isDialogClear() && (fileNameLbl.getText().trim().length() == 0)) { - getRetrieveFilename(RetrieveMergeAction.RETRIEVE); - } else { + getRetrieveFilename(RetrieveMergeAction.RETRIEVE); + } else { if (retMergeDlg == null) { retMergeDlg = new RetrieveMergeDlg(shell); retMergeDlg.setCloseCallback(new ICloseCallback() { @@ -2223,10 +2219,6 @@ public class FFFGDlg extends CaveSWTDialog implements ISourceCompAction, sc.populateSourceComp(); statusLbl.setText(""); - this.getParent() - .setCursor( - this.getParent().getDisplay() - .getSystemCursor(SWT.CURSOR_ARROW)); } /*