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

Merge "Issue #2798 - Fix issue with color not changing for existing user changing site." into development

Browse source 
Former-commit-id: 5cc3fd4451 [formerly b5f2064207] [formerly 5f79ece006] [formerly e9be36b08c [formerly 5f79ece006 [formerly 1c87269eac595b61cc54c1e39ec8624ba55fd6d8]]]
Former-commit-id: e9be36b08c
Former-commit-id: fb49f6167522402ef7ee3b3b6d33a4fef770eb46 [formerly a4728542c5]
Former-commit-id: 8ebc031a07
This commit is contained in:
Nate Jensen 2014-03-18 12:38:48 -05:00 • committed by Gerrit Code Review
commit 0eb6080598
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/session/SessionFeedView.java
View file

@ -71,6 +71,8 @@ import com.raytheon.uf.viz.core.icon.IconUtil;
* Feb 19, 2014 2751 bclement add change color icon, fix NPE when user cancels change color
* Mar 05, 2014 2798 mpduff Changed how messages are processed for the feed view.
* Mar 06, 2014 2751 bclement moved users table refresh logic to refreshParticipantList()
* Mar 18, 2014 2798 mpduff Fixed issue with user changing site and participant list not
* having the color update to reflect the change.
*
* </pre>
*
@ -407,8 +409,6 @@ public class SessionFeedView extends SessionView {
@Override
protected void participantPresenceUpdated(VenueParticipant participant,
Presence presence) {
usersTable.refresh();
// Verify we have properties
if (!presence.getPropertyNames().contains(
SiteConfigInformation.SITE_NAME)) {
@ -431,11 +431,17 @@ public class SessionFeedView extends SessionView {
message.append(user);
message.append(" ").append(roleName).append(" ")
.append(siteName);
setColorForSite(participant, presence);
sendSystemMessage(message);
processJoinAlert();
}
}
/*
* Presence changed is triggered for participant's site being changed.
* Need to set the color to handle this situation.
*/
setColorForSite(participant, presence);
refreshParticipantList();
}
/**