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

Issue #2632 - Remove user from list on sign-off. Fixed check for available

Browse source 
Change-Id: I2a389e290b697dfe06be9b4fef8d5957676f3cbe

Former-commit-id: ac9678dc6e [formerly 2a9b434883] [formerly 538261f6d5] [formerly ac9678dc6e [formerly 2a9b434883] [formerly 538261f6d5] [formerly d5df936431 [formerly 538261f6d5 [formerly 2f9981c5173f0c2523b586ce10147f738028b907]]]]
Former-commit-id: d5df936431
Former-commit-id: 378909ad2c [formerly 7aa5cebfb0] [formerly 42269ff35b4c62e12785ae2a916e17bf654fe7c6 [formerly 92f1a3a9aa]]
Former-commit-id: 326f3902389d6b4cb29f450dd9b92a133b682aa9 [formerly 0aea45197a]
Former-commit-id: ce774c07a8
This commit is contained in:
Mike Duff 2014-04-02 10:08:45 -05:00
parent e992418df6
commit a5a38133ca
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/notifier/NotifierTools.java
View file

@ -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
*
* </pre>
*
@ -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;