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

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

Browse source 
Former-commit-id: 6b20d38b1a [formerly 6b20d38b1a [formerly 8f25c8c9f9e47cbff07e8ac39dfb6ab672adb611]]
Former-commit-id: 579d2416cb
Former-commit-id: 19560ebc7c
This commit is contained in:
Nate Jensen 2014-04-02 11:23:02 -05:00 • committed by Gerrit Code Review
commit 62f1451e50
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;