From a5a38133ca4f16ba069433002a42ea6ef710024c Mon Sep 17 00:00:00 2001 From: Mike Duff Date: Wed, 2 Apr 2014 10:08:45 -0500 Subject: [PATCH] Issue #2632 - Remove user from list on sign-off. Fixed check for available Change-Id: I2a389e290b697dfe06be9b4fef8d5957676f3cbe Former-commit-id: ac9678dc6ee96520b9e106cdcb42f685638682e8 [formerly 2a9b434883247b82b6259829d7e3dd60338e9021] [formerly 538261f6d547c5f6605017970864e2ecb8015910] [formerly ac9678dc6ee96520b9e106cdcb42f685638682e8 [formerly 2a9b434883247b82b6259829d7e3dd60338e9021] [formerly 538261f6d547c5f6605017970864e2ecb8015910] [formerly d5df93643132fa50538416f4582a700e1a8ecef8 [formerly 538261f6d547c5f6605017970864e2ecb8015910 [formerly 2f9981c5173f0c2523b586ce10147f738028b907]]]] Former-commit-id: d5df93643132fa50538416f4582a700e1a8ecef8 Former-commit-id: 378909ad2c04ca0ed8fdf4d6d096996ac62ca3ec [formerly 7aa5cebfb05bb3db39e83fd1f2190413b418c016] [formerly 42269ff35b4c62e12785ae2a916e17bf654fe7c6 [formerly 92f1a3a9aaa4af1586d451348b7565aa00e86ba3]] Former-commit-id: 326f3902389d6b4cb29f450dd9b92a133b682aa9 [formerly 0aea45197a95b9a20b2397b2944741c63ea8bf77] Former-commit-id: ce774c07a83a5e09fee228d16c2684585779116b --- .../viz/collaboration/ui/notifier/NotifierTools.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/notifier/NotifierTools.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/notifier/NotifierTools.java index 072491c1cb..cfe420e52e 100644 --- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/notifier/NotifierTools.java +++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/notifier/NotifierTools.java @@ -63,6 +63,7 @@ import com.raytheon.uf.viz.core.sounds.SoundUtil; * Feb 24, 2014 2632 mpduff Initial creation. * Mar 05, 2014 2632 mpduff Removed unused field. * Mar 12, 2014 2632 mpduff Don't process the notifier if the presence is null. + * Apr 02, 2014 2632 mpduff Remove user from list every time on a sign off * * * @@ -117,9 +118,9 @@ public class NotifierTools { } } else if (usersOnline.contains(userId.getName()) && (Type.unavailable == type)) { + usersOnline.remove(userId.getName()); if (notifiers.contains(Notifier.SignOff)) { executeNotifierTask(task); - usersOnline.remove(userId.getName()); NotifierTools.taskExecuted(task); return; } @@ -127,11 +128,8 @@ public class NotifierTools { // presence mode change events for (Notifier n : notifiers) { - if (Notifier.Returns == n && mode == null) { - /* - * Apparently a null mode is the same as available. See - * AbstractUserLabelProvider.getImageName(); - */ + if (Notifier.Returns == n && mode == null + && Type.available == type) { executeNotifierTask(task); NotifierTools.taskExecuted(task); break;