From e782694ebc879d965cca2f0d03595c23321301f0 Mon Sep 17 00:00:00 2001 From: Mike Duff Date: Wed, 25 Sep 2013 16:24:26 -0500 Subject: [PATCH] Issue #2408 - Add a restore hidden notification menu item to Notification center Change-Id: If72e2d855b6fc91a8da67294a5436f73b69210a0 Former-commit-id: a1f9140aa8316f42ae27feb6598faddb15f0b592 [formerly b714451d68a0d59fd762e28bc7ba03226831a1eb] [formerly eabd2129544f6e213f113afc16b7287eb207a107] [formerly fead9cffe5ada44404adad14ca26e72b26fa06b3 [formerly eabd2129544f6e213f113afc16b7287eb207a107 [formerly 6ece820f9e38fe1e7ccb55b83afca04e7e0d989f]]] Former-commit-id: fead9cffe5ada44404adad14ca26e72b26fa06b3 Former-commit-id: fc35ccc1d5af170af5bede4d349a83ff650241c2 [formerly 559fbafa96a981c66c315498e59f5440a2e6c772] Former-commit-id: ca9fa9d9a740583a1868aefd772fe90f860a96d0 --- .../notification/NotificationDlg.java | 15 ++++++++++++++- .../notification/NotificationFilterDlg.java | 4 ++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationDlg.java b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationDlg.java index af4c2c6364..8dbd846379 100644 --- a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationDlg.java +++ b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationDlg.java @@ -101,6 +101,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback; * Apr 25, 2013 1820 mpduff Implemente delete config. * Jun 06, 2013 2030 mpduff Refactored help. * Aug 30, 2013 2314 mpduff Change the reading of the xml. Make load config dlg non-blocking. + * Sep 25, 2013 2408 mpduff Added a restore hidden notifications menu. * * * @@ -184,7 +185,7 @@ public class NotificationDlg extends CaveSWTDialog implements ITableChange, private MenuItem tooltipMI; private final Collection lockableMenuItems = new ArrayList(); - + /** Load config dialog */ private LoadSaveConfigDlg loadDlg; @@ -406,6 +407,18 @@ public class NotificationDlg extends CaveSWTDialog implements ITableChange, } }); + MenuItem unhideMI = new MenuItem(editMenu, SWT.NONE); + lockableMenuItems.add(unhideMI); + unhideMI.setText("Show Hidden Notifications"); + unhideMI.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + tableComp.populateTableDataRows(null); + tableComp.populateTable(); + } + + }); + // Create the settings menu MenuItem settingsMenuItem = new MenuItem(menuBar, SWT.CASCADE); settingsMenuItem.setText("&Settings"); diff --git a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationFilterDlg.java b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationFilterDlg.java index a5c67f2cc8..aca643aa2d 100644 --- a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationFilterDlg.java +++ b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationFilterDlg.java @@ -20,6 +20,7 @@ package com.raytheon.uf.viz.datadelivery.notification; import java.util.ArrayList; +import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -58,6 +59,7 @@ import com.raytheon.viz.ui.widgets.duallist.DualListConfig; * Feb 6, 2012 mpduff Initial creation. * Mar 20, 2012 240 jpiatt Updates to filter notification table data. * Jun 1, 2012 645 jpiatt Added tooltips. + * Sep 25, 2013 2408 mpduff Added sort to subscription lists. * * * @@ -377,6 +379,8 @@ public class NotificationFilterDlg extends CaveSWTDialogBase { } + Collections.sort(selectedSubListFinal); + Collections.sort(fullSubList); DualListConfig dualConfig = new DualListConfig(); dualConfig.setListHeight(120); dualConfig.setListWidth(125);