From 0f25e9985e889c9e8c1dcee1968a93c6ea9349e9 Mon Sep 17 00:00:00 2001
From: Brian Clements <brian.d.clements@raytheon.com>
Date: Tue, 20 May 2014 11:04:57 -0500
Subject: [PATCH] Omaha #3172 fixed ui filtering for contacts and sessions

Former-commit-id: 83654c374a4886a921947ca69b686435116a51ea [formerly 455af3612fd01093faad0acc879933616031c9de] [formerly b774503931da38dd653968af02810c31a0b6eb8d] [formerly 83654c374a4886a921947ca69b686435116a51ea [formerly 455af3612fd01093faad0acc879933616031c9de] [formerly b774503931da38dd653968af02810c31a0b6eb8d] [formerly 8dce7e9b855afb1221ec70d18634c0e41dd33ee4 [formerly b774503931da38dd653968af02810c31a0b6eb8d [formerly 4e6f168df1f957c5eed73a281441a0d4d0d76cdb]]]]
Former-commit-id: 8dce7e9b855afb1221ec70d18634c0e41dd33ee4
Former-commit-id: 99aa4f060999e801c0ff22cd48f300d91ab4ac9b [formerly c4447fc6c4f6785eeb024aed2bdf2218989d374d] [formerly 37f456b3eef102abf5d925b72829fa1b004f3f65 [formerly 4078bbaa63335ea711327b140164ad61bfa5bd7e]]
Former-commit-id: 96f3e9e0d2145c1f447ab45ea7213e6832a6a06b [formerly 213aab834f6f1296f8664ad84a718e1711e42b39]
Former-commit-id: f0ce9a6ca8801798ed5733995fd02f32381508d5
---
 .../raytheon/uf/viz/collaboration/ui/UsersTreeFilter.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/UsersTreeFilter.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/UsersTreeFilter.java
index 0242305950..0f8dfdab1c 100644
--- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/UsersTreeFilter.java
+++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/UsersTreeFilter.java
@@ -24,11 +24,13 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
+import org.jivesoftware.smack.RosterEntry;
 
+import com.raytheon.uf.viz.collaboration.comm.identity.ISession;
 import com.raytheon.uf.viz.collaboration.comm.provider.user.UserId;
 
 /**
- * TODO Add Description
+ * Filters contact list tree according to a substring filter.
  * 
  * <pre>
  * 
@@ -37,6 +39,7 @@ import com.raytheon.uf.viz.collaboration.comm.provider.user.UserId;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jun 13, 2012            mnash     Initial creation
+ * May 20, 2014 3172       bclement  fixed filtering for contacts and sessions
  * 
  * </pre>
  * 
@@ -63,7 +66,8 @@ public class UsersTreeFilter extends ViewerFilter {
             if (labelText.equals(currentText)) {
                 viewer.setSelection(new StructuredSelection(element));
             }
-            if (element instanceof UserId) {
+            if (element instanceof UserId || element instanceof RosterEntry
+                    || element instanceof ISession) {
                 String[] words = getWords(currentText);
                 for (String word : words) {
                     if (!labelText.toUpperCase().contains(word.toUpperCase())) {