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

Omaha #3172 fixed ui filtering for contacts and sessions

Browse source 
Former-commit-id: 83654c374a [formerly 455af3612f] [formerly b774503931] [formerly 83654c374a [formerly 455af3612f] [formerly b774503931] [formerly 8dce7e9b85 [formerly b774503931 [formerly 4e6f168df1f957c5eed73a281441a0d4d0d76cdb]]]]
Former-commit-id: 8dce7e9b85
Former-commit-id: 99aa4f0609 [formerly c4447fc6c4] [formerly 37f456b3eef102abf5d925b72829fa1b004f3f65 [formerly 4078bbaa63]]
Former-commit-id: 96f3e9e0d2145c1f447ab45ea7213e6832a6a06b [formerly 213aab834f]
Former-commit-id: f0ce9a6ca8
This commit is contained in:
Brian Clements 2014-05-20 11:04:57 -05:00
parent cb5a4c33a7
commit 0f25e9985e
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.StructuredViewer;
import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter; 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; import com.raytheon.uf.viz.collaboration.comm.provider.user.UserId;
/** /**
* TODO Add Description * Filters contact list tree according to a substring filter.
* *
* <pre> * <pre>
* *
@ -37,6 +39,7 @@ import com.raytheon.uf.viz.collaboration.comm.provider.user.UserId;
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Jun 13, 2012 mnash Initial creation * Jun 13, 2012 mnash Initial creation
* May 20, 2014 3172 bclement fixed filtering for contacts and sessions
* *
* </pre> * </pre>
* *
@ -63,7 +66,8 @@ public class UsersTreeFilter extends ViewerFilter {
if (labelText.equals(currentText)) { if (labelText.equals(currentText)) {
viewer.setSelection(new StructuredSelection(element)); viewer.setSelection(new StructuredSelection(element));
} }
if (element instanceof UserId) { if (element instanceof UserId || element instanceof RosterEntry
|| element instanceof ISession) {
String[] words = getWords(currentText); String[] words = getWords(currentText);
for (String word : words) { for (String word : words) {
if (!labelText.toUpperCase().contains(word.toUpperCase())) { if (!labelText.toUpperCase().contains(word.toUpperCase())) {