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

Merge "Omaha #3172 fixed ui filtering for contacts and sessions" into omaha_14.4.1

Browse source 
Former-commit-id: 8dc3683186 [formerly 77c77c6b8f] [formerly 1e408e7017] [formerly 8dc3683186 [formerly 77c77c6b8f] [formerly 1e408e7017] [formerly 966cf1f96f [formerly 1e408e7017 [formerly 62054f8f2552058b0b53b79b077a4d7699cb41e9]]]]
Former-commit-id: 966cf1f96f
Former-commit-id: 8f0913851f [formerly eb086ff461] [formerly bd9f4b599f4e6435264b1b4987d6628cb9848470 [formerly 88aa9471e1]]
Former-commit-id: 91d875f7810f65ff96178ec3352630c12832b221 [formerly 95ed06119c]
Former-commit-id: 9d1afa6876
This commit is contained in:
Nate Jensen 2014-05-20 14:51:05 -05:00 • committed by Gerrit Code Review
commit fe94471068
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/UsersTreeFilter.java
View file

@ -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())) {