From 21bd89a9fd950eec2e8fd47f12fe7f97c99b4ff8 Mon Sep 17 00:00:00 2001 From: Dustin Johnson Date: Tue, 26 Feb 2013 12:07:36 -0600 Subject: [PATCH] Issue #1592 Don't submit adhoc query when X button clicked Change-Id: I7a06857fa64a6d54279ec2dca1404062179fe279 Former-commit-id: 598eb88a04431ff77829086202d0774ea24d00d6 [formerly 598eb88a04431ff77829086202d0774ea24d00d6 [formerly 9cb2114c239e6782961e8127fe85b10a7ee38f06]] Former-commit-id: c6975aa3798949deb13a9ca934385dedafb76007 Former-commit-id: ab1dc2272bcbab1f771c358f3103cd69dc1c2f67 --- .../subset/GriddedTimingSelectionDlg.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedTimingSelectionDlg.java b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedTimingSelectionDlg.java index 9624f13737..5720184333 100644 --- a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedTimingSelectionDlg.java +++ b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedTimingSelectionDlg.java @@ -24,6 +24,8 @@ import java.util.Set; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.ShellAdapter; +import org.eclipse.swt.events.ShellEvent; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; @@ -56,7 +58,8 @@ import com.raytheon.viz.ui.presenter.components.ListConf; * Oct 11, 2012 1263 jpiatt Modified for cancel button * Nov 20, 2012 1286 djohnson Implement displayYesNoPopup. * Jan 04, 2013 1420 mpduff Add Priority Composite. - * Jan 25, 2013 1528 djohnson Subscription priority is now an enum. + * Jan 25, 2013 1528 djohnson Subscription priority is now an enum. + * Feb 26, 2013 1592 djohnson When the shell is closed, don't submit the query. * * * @@ -240,6 +243,13 @@ public class GriddedTimingSelectionDlg extends CaveSWTDialog implements cancelBtnConf.getOnClickAction().run(); } }); + + shell.addShellListener(new ShellAdapter() { + @Override + public void shellClosed(ShellEvent event) { + cancelBtnConf.getOnClickAction().run(); + } + }); } /**