From 78c69c43dfc7527b59825a52fafcc498c99f2f39 Mon Sep 17 00:00:00 2001 From: Mike Duff Date: Sun, 26 Jan 2014 18:57:26 -0600 Subject: [PATCH] Issue #2459 - Last change from unscheduled to deactivated. Former-commit-id: 9a0665ccc81489fc0237d2629e8ddac55a6f3f23 [formerly 3766f6a0f4d91ed48fb3089c024651482c0338d1] [formerly e46c226489df9efbafc86f85b4d6e3f96c882471] [formerly 9a0665ccc81489fc0237d2629e8ddac55a6f3f23 [formerly 3766f6a0f4d91ed48fb3089c024651482c0338d1] [formerly e46c226489df9efbafc86f85b4d6e3f96c882471] [formerly 81aa9ce0cbe50d6c01a114554ee4f63e9b9de491 [formerly e46c226489df9efbafc86f85b4d6e3f96c882471 [formerly 09494558cae046e97ff2126673c5a5c4fd1f0105]]]] Former-commit-id: 81aa9ce0cbe50d6c01a114554ee4f63e9b9de491 Former-commit-id: 07fb9b74d516b9cb8bb49c34b8a36d06bcdf3f5f [formerly ef5d3f370cb2db84fb0d62f2c9d988d68a502b1b] [formerly 36d2c58bed76ee7aef5431b41fe9592aebf50dc7 [formerly 5fc96739b9cd63817d669a00adac248fb92680d1]] Former-commit-id: d8450dac1871558df8eb12f7c659cd02e05826d2 [formerly 0b39c2977b7862a1660d23b3bcf3dc86c42ceac6] Former-commit-id: c030596afee9ae41c9514b9a669fb6a9eca66fe8 --- .../CancelForceApplyAndIncreaseLatencyDisplayText.java | 3 ++- .../viz/datadelivery/subscription/SubscriptionService.java | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/CancelForceApplyAndIncreaseLatencyDisplayText.java b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/CancelForceApplyAndIncreaseLatencyDisplayText.java index a2360cfb8f..5b89c78341 100644 --- a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/CancelForceApplyAndIncreaseLatencyDisplayText.java +++ b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/CancelForceApplyAndIncreaseLatencyDisplayText.java @@ -40,6 +40,7 @@ import com.raytheon.uf.viz.datadelivery.subscription.SubscriptionService.IForceA * Dec 4, 2012 1286 djohnson Initial creation * May 28, 2013 1650 djohnson More information when failing to schedule subscriptions. * Jan 17, 2014 2459 mpduff Change gui usage of unscheduled to deactivated. + * Jan 26, 2014 2459 mpduff Change unscheduled label to deactivated. * * * @@ -92,7 +93,7 @@ public class CancelForceApplyAndIncreaseLatencyDisplayText implements + " and leave in a Deactivated status"; } return titleCaseActionText + " " + name - + " and unschedule the others"; + + " and deactivate the others"; case EDIT_SUBSCRIPTIONS: return "Edit the " + ((singleSubscription) ? "subscription" : "subscriptions"); diff --git a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionService.java b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionService.java index 20a5f298bf..203a1a7893 100644 --- a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionService.java +++ b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionService.java @@ -45,7 +45,9 @@ import com.raytheon.uf.common.datadelivery.registry.GriddedTime; import com.raytheon.uf.common.datadelivery.registry.InitialPendingSubscription; import com.raytheon.uf.common.datadelivery.registry.PendingSubscription; import com.raytheon.uf.common.datadelivery.registry.PointTime; +import com.raytheon.uf.common.datadelivery.registry.RecurringSubscription; import com.raytheon.uf.common.datadelivery.registry.Subscription; +import com.raytheon.uf.common.datadelivery.registry.Subscription.SubscriptionState; import com.raytheon.uf.common.datadelivery.registry.Time; import com.raytheon.uf.common.datadelivery.registry.handlers.DataDeliveryHandlers; import com.raytheon.uf.common.datadelivery.registry.handlers.IPendingSubscriptionHandler; @@ -94,6 +96,7 @@ import com.raytheon.uf.viz.datadelivery.utils.DataDeliveryUtils; * Oct 12, 2013 2460 dhladky restored adhoc subscriptions to registry storage. * Oct 22, 2013 2292 mpduff Removed subscriptionOverlapService. * Nov 07, 2013 2291 skorolev Used showText() method for "Shared Subscription" message. + * Jan 26, 2014 2259 mpduff Turn off subs to be deactivated. * * * @@ -768,6 +771,10 @@ public class SubscriptionService implements ISubscriptionService { continue; } unscheduledSub.setUnscheduled(true); + if (unscheduledSub instanceof RecurringSubscription) { + ((RecurringSubscription) unscheduledSub) + .setSubscriptionState(SubscriptionState.OFF); + } subscriptionHandler.update(unscheduledSub); } }