From 73a3213cd1f182489320b2517a1fa051e04010ca Mon Sep 17 00:00:00 2001
From: Brian Clements <brian.d.clements@raytheon.com>
Date: Fri, 20 Dec 2013 14:40:00 -0600
Subject: [PATCH] Issue #2563 fixed label issue for non-grouped roster entry

the old code assumed that the username was populated in the roster object
new code uses the userId which is always populated


Former-commit-id: 0ce560149e3a587b25ae4216f9aab19474fe7618 [formerly 73347283b66b962d0e91adbc23ca7cdc9dff1d71] [formerly 0ce560149e3a587b25ae4216f9aab19474fe7618 [formerly 73347283b66b962d0e91adbc23ca7cdc9dff1d71] [formerly d07bc465d4ce9e8d372eaf0e72ad92649b1e06dd [formerly 5fe0f88b3465ba65efabe2a41d1df392c85e041f]]]
Former-commit-id: d07bc465d4ce9e8d372eaf0e72ad92649b1e06dd
Former-commit-id: 5dcaa9811007ec338531943f2e9a820601382b92 [formerly 0f4be44a237043847019c2e328a9ed6521279dd7]
Former-commit-id: 70d4484473db28b5ceaa7f533818202c76d095d9
---
 .../uf/viz/collaboration/ui/UsersTreeLabelProvider.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/UsersTreeLabelProvider.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/UsersTreeLabelProvider.java
index 997f18b153..3397c1c87c 100644
--- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/UsersTreeLabelProvider.java
+++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/UsersTreeLabelProvider.java
@@ -125,7 +125,8 @@ public class UsersTreeLabelProvider extends ColumnLabelProvider {
         if (element instanceof RosterGroup) {
             return ((RosterGroup) element).getName();
         } else if (element instanceof RosterEntry) {
-            return ((RosterEntry) element).getName();
+            return userLabelProvider.getText(IDConverter
+                    .convertFrom((RosterEntry) element));
         } else if (element instanceof SessionGroupContainer) {
             return "Active Sessions";
         } else if (element instanceof UserId) {