Merge "Issue #1592 Don't submit adhoc query when X button clicked" into development

Former-commit-id: 074fb0aa64 [formerly 47cb278c01] [formerly 074fb0aa64 [formerly 47cb278c01] [formerly d31392d740 [formerly bf86849d284696553ed4cbc3f347afe2f791968d]]]
Former-commit-id: d31392d740
Former-commit-id: 8e4a990d1a [formerly a7d4b23597]
Former-commit-id: abf85b6b0e
This commit is contained in:
Dustin Johnson 2013-02-26 13:41:46 -06:00 committed by Gerrit Code Review
commit 7b73dbc256

View file

@ -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.
*
* </pre>
*
@ -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();
}
});
}
/**