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

Merge "Issue #2205 Fix cancelling adhoc queries" into omaha_13.5.1

Browse source 
Former-commit-id: fda3ba6d5b [formerly a3b77f2623] [formerly fda3ba6d5b [formerly a3b77f2623] [formerly d5ea12d97f [formerly d60e75576a5f80f8838330789c97e89788c7a057]]]
Former-commit-id: d5ea12d97f
Former-commit-id: c8c2a3d636 [formerly 3947baa02d]
Former-commit-id: e1092b5725
This commit is contained in:
Greg Armendariz 2013-07-19 14:15:24 -05:00 • committed by Gerrit Code Review
commit 6c35eb215a
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
View file

@ -99,6 +99,7 @@ import com.raytheon.uf.viz.datadelivery.utils.DataDeliveryUtils;
* May 21, 2013 2020 mpduff Rename UserSubscription to SiteSubscription.
* Jun 04, 2013 223 mpduff Added grid specific items to this class.
* Jun 11, 2013 2064 mpduff Fix editing of subscriptions.
* Jul 18, 2013 2205 djohnson If null time is selected from the dialog, return null for the adhoc.
*
*
* </pre>
@ -607,6 +608,9 @@ public class GriddedSubsetManagerDlg
if (sub instanceof AdhocSubscription) {
newTime = setupDataSpecificTime(newTime, sub);
if (newTime == null) {
return null;
}
sub.setTime(newTime);
} else if (!create) {
Time time = sub.getTime();