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: ed18aedfee [formerly 72c8f1d844] [formerly c0704488cc] [formerly c0704488cc [formerly 6b20d38b1a]] [formerly ed18aedfee [formerly 72c8f1d844] [formerly c0704488cc] [formerly c0704488cc [formerly 6b20d38b1a]] [formerly 579d2416cb [formerly c0704488cc [formerly 6b20d38b1a] [formerly 579d2416cb [formerly 8f25c8c9f9e47cbff07e8ac39dfb6ab672adb611]]]]]
Former-commit-id: 579d2416cb
Former-commit-id: 7e8c7e739b [formerly 5821a0e0e0] [formerly d5d42f2f6b] [formerly f1e8c8d20d694029199f592528a7e952c2e0daf9 [formerly b937a5eaf68a15c6804ca9d1bfabddacdd99ff79] [formerly d5d42f2f6b [formerly 19560ebc7c]]]
Former-commit-id: fa09d55fb93d1471a2cc4ec7ac6ac1baa62d0c16 [formerly bf3a7ac4f9e4177a919e5423eb8d193e349a283a] [formerly 691c4411fc [formerly 62f1451e50]]
Former-commit-id: 691c4411fc
Former-commit-id: 51502f7db5
This commit is contained in:
Nate Jensen 2014-04-02 11:23:02 -05:00 • committed by Gerrit Code Review
commit 7cde3b1f78
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. * Feb 24, 2014 2632 mpduff Initial creation.
* Mar 05, 2014 2632 mpduff Removed unused field. * Mar 05, 2014 2632 mpduff Removed unused field.
* Mar 12, 2014 2632 mpduff Don't process the notifier if the presence is null. * 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> * </pre>
* *
@ -117,9 +118,9 @@ public class NotifierTools {
} }
} else if (usersOnline.contains(userId.getName()) } else if (usersOnline.contains(userId.getName())
&& (Type.unavailable == type)) { && (Type.unavailable == type)) {
usersOnline.remove(userId.getName());
if (notifiers.contains(Notifier.SignOff)) { if (notifiers.contains(Notifier.SignOff)) {
executeNotifierTask(task); executeNotifierTask(task);
usersOnline.remove(userId.getName());
NotifierTools.taskExecuted(task); NotifierTools.taskExecuted(task);
return; return;
} }
@ -127,11 +128,8 @@ public class NotifierTools {
// presence mode change events // presence mode change events
for (Notifier n : notifiers) { for (Notifier n : notifiers) {
if (Notifier.Returns == n && mode == null) { if (Notifier.Returns == n && mode == null
/* && Type.available == type) {
* Apparently a null mode is the same as available. See
* AbstractUserLabelProvider.getImageName();
*/
executeNotifierTask(task); executeNotifierTask(task);
NotifierTools.taskExecuted(task); NotifierTools.taskExecuted(task);
break; break;