From 8f8300320c442d6a6250bd735fd2e437f30a51b4 Mon Sep 17 00:00:00 2001 From: Mike Duff Date: Fri, 14 Feb 2014 08:53:40 -0600 Subject: [PATCH] Issue #2806 - Disable activate/deactivate buttons when viewing subscriptions from another site. Former-commit-id: b34c9eedd0ee3aa6a72f41ec24197bae7de283bb [formerly 43ea3b0918e25fad739d61098d33e94c461d0e0c] [formerly ac62d322ed6e369726cc1528fe6f9648a93cc6c5] [formerly b34c9eedd0ee3aa6a72f41ec24197bae7de283bb [formerly 43ea3b0918e25fad739d61098d33e94c461d0e0c] [formerly ac62d322ed6e369726cc1528fe6f9648a93cc6c5] [formerly 346dc4afff27a3000b4c614ec55a760557575a59 [formerly ac62d322ed6e369726cc1528fe6f9648a93cc6c5 [formerly a2dcb434e8d72e0046c6af9900e0abd093f9bcbc]]]] Former-commit-id: 346dc4afff27a3000b4c614ec55a760557575a59 Former-commit-id: fad65749a8cf8bebd7c3f695994f75f8e0fb424c [formerly 6601dff4836d790cab1b8e1fb88a7369db7f69f7] [formerly 2be8bfeadfd1af814a97057e7cfe23152263de88 [formerly 5b3a55d11f00fd555935610e1f47a41b16ba1eda]] Former-commit-id: 3add04f6f2835f888f0452d213544d97cca8f1c0 [formerly c5f33b0ed0925cbf488cf4ea50b27a2e8d528612] Former-commit-id: fe38928d3306e38e77912855ff2308b5b9b0e5c9 --- .../subscription/SubscriptionManagerDlg.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java index 2c77e54fbb..aaf63203a0 100644 --- a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java +++ b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java @@ -153,6 +153,8 @@ import com.raytheon.viz.ui.presenter.IDisplay; * Jan 08, 2014 2642 mpduff Update dialog for permissions, adding site to shared * Jan 14, 2014 2459 mpduff Change Subscription status code * Feb 04, 2014 2722 mpduff Add auto-refresh task. + * Feb 14, 2014 2806 mpduff Disable activate/deactivate buttons when viewing other site's subscriptions + * * * * @author mpduff @@ -356,7 +358,7 @@ public class SubscriptionManagerDlg extends CaveSWTDialog implements createBottomButtons(); - enableMenus(true); + enableControls(true); } /* @@ -655,7 +657,7 @@ public class SubscriptionManagerDlg extends CaveSWTDialog implements @Override public void widgetSelected(SelectionEvent event) { handleFilterSelection(); - enableMenus(officeCbo.getText().equals(CURRENT_SITE)); + enableControls(officeCbo.getText().equals(CURRENT_SITE)); } }); @@ -1518,9 +1520,12 @@ public class SubscriptionManagerDlg extends CaveSWTDialog implements } /** - * Enable/Disable menus. + * Enable/Disable controls. + * + * @param enable + * true to enable, false to disable */ - private void enableMenus(boolean enable) { + private void enableControls(boolean enable) { copyMI.setEnabled(enable); deleteGroupMI.setEnabled(enable); editMI.setEnabled(enable); @@ -1530,6 +1535,8 @@ public class SubscriptionManagerDlg extends CaveSWTDialog implements groupMI.setEnabled(enable); newMI.setEnabled(enable); tableComp.enableMenus(enable); + activateBtn.setEnabled(enable); + deactivateBtn.setEnabled(enable); } /**