Attachment #123308 for bug #256696

Lines 35-40 Link Here

(-)src/org/eclipse/ecf/internal/provider/xmpp/Messages.java (+1 lines)
35	public static String XMPPContainer_UNEXPECTED_EVENT;	35	public static String XMPPContainer_UNEXPECTED_EVENT;
36	public static String XMPPContainer_UNEXPECTED_XMPP_MESSAGE;	36	public static String XMPPContainer_UNEXPECTED_XMPP_MESSAGE;
37	public static String XMPPContainer_UNRECOGONIZED_CONTAINER_MESSAGE;	37	public static String XMPPContainer_UNRECOGONIZED_CONTAINER_MESSAGE;
		38	public static String XMPPContainer_UNRECOGONIZED_SEARCH_SERVICE;
38	public static String XMPPFileID_EXCEPTION_FILE_IDS_NOT_URLS;	39	public static String XMPPFileID_EXCEPTION_FILE_IDS_NOT_URLS;
39	public static String XMPPFileNamespace_EXCEPTION_FILEID_FILENAME_NOT_NULL;	40	public static String XMPPFileNamespace_EXCEPTION_FILEID_FILENAME_NOT_NULL;
40	public static String XMPPFileNamespace_EXCEPTION_FILEID_TARGETID_NOT_NULL;	41	public static String XMPPFileNamespace_EXCEPTION_FILEID_TARGETID_NOT_NULL;




					final IRosterEntry entry = createRosterEntry(newID, item);
					if (itemType == RosterPacket.ItemType.NONE
							|| itemType == RosterPacket.ItemType.REMOVE) {
						removeItemFromRoster(roster.getItems(),
								createIDFromName(item.getUser()));
						remove = true;
					} else {
						remove = false;

			rosterManager.notifyRosterAdd(entry);
	}

	private void removeItemFromRoster(Collection rosterItems,
			XMPPID itemIDToRemove) {
		boolean removed = false;
		Collection rosterItems = roster.getItems();
		synchronized (rosterItems) {
			for (final Iterator i = rosterItems.iterator(); i.hasNext();) {
				final IRosterItem item = (IRosterItem) i.next();
				if (item instanceof org.eclipse.ecf.presence.roster.RosterGroup) {
					final org.eclipse.ecf.presence.roster.RosterGroup group = (org.eclipse.ecf.presence.roster.RosterGroup) item;
					removed = removeItemFromRosterGroup(group, itemIDToRemove);
					if (r)
						removed = true;
					// If group is empty, remove it too
					if (group.getEntries().size() == 0)
						i.remove();
				} else if (item instanceof org.eclipse.ecf.presence.roster.RosterEntry) {
					if (((org.eclipse.ecf.presence.roster.RosterEntry) item)
							.getUser().getID().equals(itemIDToRemove)) {
					if (entryID.equals(itemIDToRemove)) {
						i.remove();
						removed = true;
					}

			for (final Iterator i = group.getEntries().iterator(); i.hasNext();) {
				final org.eclipse.ecf.presence.roster.RosterEntry entry = (org.eclipse.ecf.presence.roster.RosterEntry) i
						.next();
				if (entry.getUser().getID().equals(itemIDToRemove)) {
				if (entryID.equals(itemIDToRemove)) {
					i.remove();
					return true;
				}


	private void updatePresence(XMPPID fromID, IPresence newPresence) {
		final Collection rosterItems = roster.getItems();
		List newEntrys = new ArrayList();
		synchronized (rosterItems) {
			for (final Iterator i = roster.getItems().iterator(); i.hasNext();) {
				final IRosterItem item = (IRosterItem) i.next();
				if (item instanceof IRosterGroup) {
					AdditionalClientRosterEntry[] es = updatePresenceInGroup(
							(IRosterGroup) item, fromID, newPresence);
					for (int j = 0; j < es.length; j++) {
						newEntrys.add(es[j]);
					}
				} else if (item instanceof org.eclipse.ecf.presence.roster.RosterEntry) {
					AdditionalClientRosterEntry entry = updatePresenceForMatchingEntry(
							(org.eclipse.ecf.presence.roster.RosterEntry) item,
							fromID, newPresence);
					if (entry != null)
						newEntrys.add(entry);
				}
			}
		}

		AdditionalClientRosterEntry[] entrys = (AdditionalClientRosterEntry[]) newEntrys
				.toArray(new AdditionalClientRosterEntry[] {});
		IRosterEntry entry = null;
		if (entrys.length > 0) {
			for (int i = 0; i < entrys.length; i++) {
				entry = new org.eclipse.ecf.presence.roster.RosterEntry(entrys[i].parent,entrys[i].user,entrys[i].presence);
				//roster.addItem(entry);
				}
			} else {
				// remove from roster as it's another client
				removeFromRoster(fromID);
			}
			rosterManager.notifyRosterUpdate(roster);
			fireSetRosterEntry(false, entry);
		}
	}

	class AdditionalClientRosterEntry {
		
		IRosterItem parent;
		IUser user;
		IPresence presence;
		
		public AdditionalClientRosterEntry(IRosterItem parent, IUser user, IPresence presence) {
		public AdditionalClient(IRosterItem parent, IUser user,
				IPresence presence, boolean add) {
			this.parent = parent;
			this.user = user;
			this.presence = presence;
			this.add = add;
		}

		public AdditionalClient(IUser user) {
			this.user = user;
			this.add = false;
		}
	}

	private int countClientsInRosterGroup(
			org.eclipse.ecf.presence.roster.RosterGroup group, XMPPID oldID) {
		Collection groupItems = group.getEntries();
		int count = 0;
		for (final Iterator i = groupItems.iterator(); i.hasNext();) {
			final IRosterItem item = (IRosterItem) i.next();
			if (item instanceof org.eclipse.ecf.presence.roster.RosterEntry) {
				org.eclipse.ecf.presence.roster.RosterEntry entry = (org.eclipse.ecf.presence.roster.RosterEntry) item;
				XMPPID entryID = (XMPPID) entry.getUser().getID();
				if (entryID.getUsernameAtHost().equals(
						oldID.getUsernameAtHost()))
					count++;
			}
		}
		return count;
	}
	
	
	private AdditionalClientRosterEntry updatePresenceForMatchingEntry(
		int count = 0;
		synchronized (rosterItems) {
			for (final Iterator i = rosterItems.iterator(); i.hasNext();) {
				final IRosterItem item = (IRosterItem) i.next();
				if (item instanceof org.eclipse.ecf.presence.roster.RosterGroup) {
					final org.eclipse.ecf.presence.roster.RosterGroup group = (org.eclipse.ecf.presence.roster.RosterGroup) item;
					count += countClientsInRosterGroup(group, oldID);
				} else if (item instanceof org.eclipse.ecf.presence.roster.RosterEntry) {
					org.eclipse.ecf.presence.roster.RosterEntry entry = (org.eclipse.ecf.presence.roster.RosterEntry) item;
					XMPPID entryID = (XMPPID) entry.getUser().getID();
					if (entryID.getUsernameAtHost().equals(
							oldID.getUsernameAtHost())) {
						count++;
					}
				}
			}
		}
		return count;
	}

	private boolean rosterGroupContainsEntry(
			org.eclipse.ecf.presence.roster.RosterGroup group, XMPPID oldID) {
		Collection groupItems = group.getEntries();
		for (final Iterator i = groupItems.iterator(); i.hasNext();) {
			final IRosterItem item = (IRosterItem) i.next();
			if (item instanceof org.eclipse.ecf.presence.roster.RosterEntry) {
				org.eclipse.ecf.presence.roster.RosterEntry entry = (org.eclipse.ecf.presence.roster.RosterEntry) item;
				XMPPID entryID = (XMPPID) entry.getUser().getID();
				if (entryID.equals(oldID))
					return true;
			}
		}
		return false;
	}

	private boolean rosterContainsEntry(XMPPID oldID) {
		Collection rosterItems = roster.getItems();
		synchronized (rosterItems) {
			for (final Iterator i = rosterItems.iterator(); i.hasNext();) {
				final IRosterItem item = (IRosterItem) i.next();
				if (item instanceof org.eclipse.ecf.presence.roster.RosterGroup) {
					final org.eclipse.ecf.presence.roster.RosterGroup group = (org.eclipse.ecf.presence.roster.RosterGroup) item;
					if (rosterGroupContainsEntry(group, oldID))
						return true;
				} else if (item instanceof org.eclipse.ecf.presence.roster.RosterEntry) {
					org.eclipse.ecf.presence.roster.RosterEntry entry = (org.eclipse.ecf.presence.roster.RosterEntry) item;
					XMPPID entryID = (XMPPID) entry.getUser().getID();
					if (entryID.equals(oldID))
						return true;
				}
			}
		}
		return false;
	}

	private AdditionalClient removeEntryFromRoster(XMPPID oldID,
			org.eclipse.ecf.presence.roster.RosterEntry entry,
			IPresence newPresence, IUser user) {
		if (countClientsInRoster(oldID) > 1) {
			// remove this client from roster
			return new AdditionalClient(user);
		} else {
			// Last one, so we set resource to null and set presence to
			// unavailable
			oldID.setResourceName(null);
			entry.setPresence(newPresence);
			rosterManager.notifyRosterUpdate(entry);
			return null;
		}
	}

	private AdditionalClient updatePresenceForMatchingEntry(
			org.eclipse.ecf.presence.roster.RosterEntry entry, XMPPID fromID,
			IPresence newPresence) {
		final IUser user = entry.getUser();
		XMPPID oldID = (XMPPID) user.getID();
		// If the username/host part matches that means we either have to update
		// the resource, or create a new client
		if (oldID.equals(fromID)) {
			// set the new presence state
			entry.setPresence(newPresence);
			// and notify with roster update
			rosterManager.notifyRosterUpdate(entry);
		} else if (oldID.getUsernameAtHost().equals(fromID.getUsernameAtHost())) {
			if (oldID.getResourceName() == null) {
				oldID.setResourceName(fromID.getResourceName());
				// set the new presence state
				entry.setPresence(newPresence);
				// and notify with roster update
				rosterManager.notifyRosterUpdate(entry);
			} else if (fromID.getResourceName() != null && !newPresence.getType().equals(IPresence.Type.UNAVAILABLE)) {
				return new AdditionalClientRosterEntry(entry.getParent(), new User(fromID, user.getName()), newPresence);
				if (oldID.getResourceName() == null) {
					oldID.setResourceName(fromID.getResourceName());
					// set the new presence state
					entry.setPresence(newPresence);
					// and notify with roster update
					rosterManager.notifyRosterUpdate(entry);
				} else
					return new AdditionalClient(entry.getParent(), new User(
							fromID, user.getName()), newPresence, true);
			}
		}
		return null;
	}

	private AdditionalClientRosterEntry[] updatePresenceInGroup(IRosterGroup group,
			XMPPID fromID, IPresence newPresence) {
		List results = new ArrayList();
		final Collection groupEntries = group.getEntries();
		AdditionalClient newEntry = null;
		synchronized (groupEntries) {
			for (final Iterator i = group.getEntries().iterator(); i.hasNext();) {
				AdditionalClientRosterEntry newEntry = updatePresenceForMatchingEntry(
						(org.eclipse.ecf.presence.roster.RosterEntry) i.next(),
						fromID, newPresence);
				if (newEntry != null)
					results.add(newEntry);
			}
		}
		return (AdditionalClientRosterEntry[]) results.toArray(new AdditionalClientRosterEntry[] {});
	}

	protected void handleRoster(Roster roster) {

Lines 22-28 Link Here

(-)src/org/eclipse/ecf/internal/provider/xmpp/messages.properties (-1 / +2 lines)
22	XMPPContainer_EXCEPTION_INVALID_RESPONSE_FROM_SERVER=invalid connect response from server	22	XMPPContainer_EXCEPTION_INVALID_RESPONSE_FROM_SERVER=invalid connect response from server
23	XMPPIncomingFileTransfer_Status_Transfer_Exception=Transfer Exception	23	XMPPIncomingFileTransfer_Status_Transfer_Exception=Transfer Exception
24	XMPPContainer_EXCEPTION_ADDING_SHARED_OBJECT=Exception adding shared object %1	24	XMPPContainer_EXCEPTION_ADDING_SHARED_OBJECT=Exception adding shared object %1
25	XMPPContainer_UNRECOGONIZED_CONTAINER_MESSAGE=got unrecognized container message...ignoring message	25	XMPPContainer_UNRECOGONIZED_CONTAINER_MESSAGE=got unrecognized container message...ignoring message
		26	XMPPContainer_UNRECOGONIZED_SEARCH_SERVICE=Search Service not available on the server
26	XMPPContainer_UNEXPECTED_EVENT=processAsynch got unexpected event %1	27	XMPPContainer_UNEXPECTED_EVENT=processAsynch got unexpected event %1
27	XMPPContainer_EXCEPTION_HANDLING_ASYCH_EVENT=processAsynch exception processing event %1	28	XMPPContainer_EXCEPTION_HANDLING_ASYCH_EVENT=processAsynch exception processing event %1
28	XMPPFileID_EXCEPTION_FILE_IDS_NOT_URLS=XMPPFileIDs cannot be represented as URLs.	29	XMPPFileID_EXCEPTION_FILE_IDS_NOT_URLS=XMPPFileIDs cannot be represented as URLs.




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/
package org.eclipse.ecf.internal.provider.xmpp.search;

import org.eclipse.ecf.core.user.IUser;
import org.eclipse.ecf.presence.search.IResult;

/**
 * Implement a specific result for XMPP
 *@since 3.0
 */
public class XMPPResultItem implements IResult {

	/** contain a IUser */
	protected IUser user;

	/**
	 * Create a XMPP result with a IUser
	 * @param user IUser
	 */
	public XMPPResultItem(IUser user) {
		this.user = user;
	}

	/*
	 * (non-Javadoc)
	 * @see org.eclipse.ecf.presence.search.IResult#getUser()
	 */
	public IUser getUser() {
		return user;
	}

	/**
	 * Verify if there is the same IUser. Compare using ID
	 */
	public boolean equals(Object o) {
		if(o instanceof XMPPResultItem)
			return ((XMPPResultItem) o).getUser().getID().toString().equals(user.getID().toString());
		else
			return false;
	}

	public int hashCode() {
		return (user.getID().toString() != null ? user.getID().toString()
				.hashCode() : 0);
	}

	public Object getAdapter(Class adapter) {
		// TODO Auto-generated method stub
		return null;
	}

}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/
package org.eclipse.ecf.internal.provider.xmpp.search;

import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;

import org.eclipse.ecf.presence.search.ICriteria;
import org.eclipse.ecf.presence.search.ICriterion;

/**
 * Implement a specific criteria control for XMPP
 *@since 3.0
 */
public class XMPPCriteria implements ICriteria {

	/** criteria list */
	protected List criteria;
	
	/**
	 * Create a criteria with a sync list
	 */
	public XMPPCriteria(){
		criteria = Collections.synchronizedList(new ArrayList());
	}
	
	/*
	 * (non-Javadoc)
	 * @see org.eclipse.ecf.presence.search.ICriteria#add(org.eclipse.ecf.presence.search.ICriterion)
	 */
	public void add(ICriterion criterion) {
		criteria.add(criterion);
	}

	/*
	 * (non-Javadoc)
	 * @see org.eclipse.ecf.presence.search.ICriteria#getCriterions()
	 */
	public List getCriterions() {
		return criteria;
	}

	/*
	 * (non-Javadoc)
	 * @see org.eclipse.ecf.presence.search.ICriteria#isEmpty()
	 */
	public boolean isEmpty() {
		return criteria.isEmpty();
	}
	
	public String toString() {
		StringBuffer sb = new StringBuffer("XMPPCriteria["); //$NON-NLS-1$
		Iterator it = criteria.iterator();
		while (it.hasNext()) {
			sb.append("[");//$NON-NLS-1$
			ICriterion criterion = (ICriterion) it.next();
			sb.append(criterion.toString());
			sb.append("];");//$NON-NLS-1$
		}
		sb.append("];");//$NON-NLS-1$
		return sb.toString();
	}

}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/
package org.eclipse.ecf.internal.provider.xmpp.search;

import org.eclipse.ecf.presence.search.ICriteria;
import org.eclipse.ecf.presence.search.IResultList;
import org.eclipse.ecf.presence.search.ISearch;
import org.eclipse.ecf.presence.search.ResultList;

/**
 * Implement ISearch for XMPP
 *@since 3.0
 */
public class XMPPSearch implements ISearch {

	protected IResultList resultList;
	private ICriteria criteria;

	/*
	 * (non-Javadoc)
	 * @see org.eclipse.ecf.presence.search.ISearch#getResultList()
	 */
	public IResultList getResultList() {
		return resultList;
	}

	protected XMPPSearch(ICriteria criteria) {
		this.criteria = criteria;
	}

	public XMPPSearch(ResultList resultList) {
		this.resultList = resultList;
	}

	public ICriteria getCriteria() {
		return this.criteria;
	}

	public void setResultList(IResultList resultList) {
		this.resultList = resultList;
		
	}
	

}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/
package org.eclipse.ecf.internal.provider.xmpp.search;

import org.eclipse.ecf.presence.search.ICriterion;
import org.eclipse.ecf.presence.search.Restriction;

/**
 * Implement a specific Selection for XMPP
 * @since 3.0
 */
public class XMPPSelection extends Restriction {

	/*
	 * (non-Javadoc)
	 * @see org.eclipse.ecf.presence.search.ISelection#eq(java.lang.String, java.lang.String)
	 */
	public ICriterion eq(String field, String value) {
		//the operator is ignored for XMPP
		return new XMPPSimpleCriterion(field, value, "");
	}
	
	/*
	 * (non-Javadoc)
	 * @see org.eclipse.ecf.presence.search.ISelection#eq(java.lang.String, java.lang.String)
	 */
	public ICriterion eq(String field, String value, boolean ignoreCase) {
		//the operator is ignored for XMPP
		return new XMPPSimpleCriterion(field, value, "");
	}
	
}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/
package org.eclipse.ecf.internal.provider.xmpp.search;

import java.net.URISyntaxException;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;

import org.eclipse.core.runtime.Assert;
import org.eclipse.ecf.core.ContainerConnectException;
import org.eclipse.ecf.core.identity.ID;
import org.eclipse.ecf.core.identity.Namespace;
import org.eclipse.ecf.core.user.IUser;
import org.eclipse.ecf.core.user.User;
import org.eclipse.ecf.internal.provider.xmpp.Messages;
import org.eclipse.ecf.internal.provider.xmpp.smack.ECFConnection;
import org.eclipse.ecf.presence.search.AbstractUserSearchManager;
import org.eclipse.ecf.presence.search.ICriteria;
import org.eclipse.ecf.presence.search.ICriterion;
import org.eclipse.ecf.presence.search.IResultList;
import org.eclipse.ecf.presence.search.ISearch;
import org.eclipse.ecf.presence.search.IRestriction;
import org.eclipse.ecf.presence.search.IUserSearchListener;
import org.eclipse.ecf.presence.search.IUserSearchManager;
import org.eclipse.ecf.presence.search.ResultList;
import org.eclipse.ecf.presence.search.UserSearchException;
import org.eclipse.ecf.provider.xmpp.identity.XMPPID;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smackx.Form;
import org.jivesoftware.smackx.FormField;
import org.jivesoftware.smackx.ReportedData;
import org.jivesoftware.smackx.ReportedData.Row;
import org.jivesoftware.smackx.search.UserSearch;

/**
 * A specific implementation for XMPP provider. XEP-0055:
 * http://www.xmpp.org/extensions/xep-0055.html
 * 
 * @see IUserSearchManager
 * @since 3.0
 */
public class XMPPSearchManager extends AbstractUserSearchManager {

	/** Search service name on XMPP server */
	protected static final String SERVICE_SEARCH = "search.";

	/** Wrapper for XMPP connection */
	protected ECFConnection ecfConnection;

	protected Namespace connectNamespace;

	protected ID connectedID;

	protected Form form;

	protected UserSearch manager;

	protected boolean enabled;

	protected static final String FORM_TYPE = "FORM_TYPE";

	protected static final String NAME = "name";

	protected static final String JID = "jid";

	protected static final String SEARCH_ACTION = "search";

	public XMPPSearchManager() {
		manager = new UserSearch();
	}
	
	/**
	 * Create a specific {@link ICriteria} for XMPP
	 */
	public ICriteria createCriteria() {
		return new XMPPCriteria();
	}

	/**
	 * Create a specific {@link IRestriction} for XMPP
	 */
	public IRestriction createSelection() {
		return new XMPPSelection();
	}

	/**
	 * Specific implementation for XMPP
	 * 
	 * @see IUserSearchManager#search(ICriteria).
	 */
	public ISearch search(ICriteria criteria) throws UserSearchException {

		ResultList resultList = new ResultList();
		try {
			//initialize the form by chance it is null
			if (form == null)
				form = manager.getSearchForm(ecfConnection.getXMPPConnection(),
						SERVICE_SEARCH
								+ ecfConnection.getXMPPConnection()
										.getServiceName());

			/*
			 * For XMPP criterion is considered. The XMPP server will deal with
			 * the search.
			 */
			List criterions = criteria.getCriterions();
			// add the fields for the search dynamically
			// consider just the fields used on the search
			// fields checked by user
			
			String fields[] = getUserPropertiesFields();
			for (int i = 0; i < fields.length; i++) {
				Iterator criterionsIterator = criterions.iterator();
				//for each user properties field check if it
				//was added by user for the criteria
				//for each field, a search is performed, and 
				//the partial result is added to the result list
				while (criterionsIterator.hasNext()) {
					ICriterion criterion = (ICriterion) criterionsIterator.next();
					if(criterion.equals(fields[i])){
						Form answerForm = form.createAnswerForm();
						answerForm.setAnswer(fields[i], true);
						answerForm.setAnswer(SEARCH_ACTION, criterion.toExpression());
						ReportedData data = manager.sendSearchForm(ecfConnection
								.getXMPPConnection(), answerForm, SERVICE_SEARCH + ecfConnection.getXMPPConnection().getServiceName());
						// create a result list from ReportedData
						IResultList partialResultList = createResultList(data);
						resultList.addAll(partialResultList.geResults());
					}
				}
			}			

			return new XMPPSearch(resultList);
			
		} catch (final XMPPException e) {
			String message = null;
			if (e.getXMPPError() != null && e.getXMPPError().getCode() == 404) {
				message = Messages.XMPPContainer_UNRECOGONIZED_SEARCH_SERVICE;
			} else{
				message = e.getLocalizedMessage();
			}
			throw new UserSearchException(message, e, criteria);
		} catch (ContainerConnectException e) {
			throw new UserSearchException(e, criteria);
		}

	}

	/**
	 * Create a result list from ReportedData. Identify dynamically columns and
	 * rows and create users adding it to a {@link IResultList}
	 * 
	 * @param data ReportedData
	 * @return {@link IResultList} a list of users
	 * @throws  
	 */
	protected IResultList createResultList(ReportedData data) {
		ResultList result = new ResultList();
		Iterator rows = data.getRows();
		while (rows.hasNext()) {
			Row row = (Row) rows.next();
			Iterator jids = row.getValues(JID);
			Iterator names = row.getValues(NAME);
			String jid = null;
			String name = null;
			// XMPP server returns the same length for both
			while (jids.hasNext() && names.hasNext()) {
				try {
					jid = (String) jids.next();
					name = (String) names.next();					
					IUser user = new User(new XMPPID(connectNamespace, jid), name);
					result.add(new XMPPResultItem(user));
				} catch(URISyntaxException e){
					throw new RuntimeException(
							"cannot create connect id for client " + jid
									+ " , name = " + name, e);
				}
			}
		}
		return result;
	}

	/**
	 * Specific implementation for XMPP
	 * 
	 * @see IUserSearchManager#search(ICriteria).
	 */
	public void search(ICriteria criteria, IUserSearchListener listener) {
		this.criteria = criteria;
		addListener(listener);
	}

	/**
	 * These parameters must be not null
	 * 
	 * @param connectNamespace
	 * @param connectedID
	 * @param connection
	 */
	public void setConnection(Namespace connectNamespace, ID connectedID,
			ECFConnection connection) {
		Assert.isNotNull(connectNamespace);
		Assert.isNotNull(connectedID);
		Assert.isNotNull(connection);
		this.connectNamespace = connectNamespace;
		this.connectedID = connectedID;
		this.ecfConnection = connection;
	}

	/**
	 * Returns the user properties fields available on the XMPP server
	 * 
	 * @param form
	 * @return String[] fields for form
	 * @throws ContainerConnectException 
	 */
	public String[] getUserPropertiesFields() throws ContainerConnectException {
		try{
			if (form == null)
				form = manager.getSearchForm(ecfConnection.getXMPPConnection(),
						SERVICE_SEARCH + ecfConnection.getXMPPConnection().getServiceName());
	
			Set fields = new HashSet();
			Iterator userProperties = form.getFields();
			while (userProperties.hasNext()) {
				FormField field = (FormField) userProperties.next();
				String variable = field.getVariable();
				// ignore these fields
				if (!variable.equalsIgnoreCase(FORM_TYPE)
						&& !variable.equalsIgnoreCase(SEARCH_ACTION))
					fields.add(variable);
			}
			return (String[]) fields.toArray(new String[0]);
		} catch (final XMPPException e) {
			String message = null;
			if (e.getXMPPError() != null && e.getXMPPError().getCode() == 404) {
				message = Messages.XMPPContainer_UNRECOGONIZED_SEARCH_SERVICE;
			} else{
				message = e.getLocalizedMessage();
			}
			throw new ContainerConnectException(message, e);
		}

	}
	
	/**
	 * Notify that user search for XMPP is enabled
	 */
	public boolean isEnabled() {
		return this.enabled;
	}
	
	/**
	 * For gtalk it should be not enabled
	 * @param enabled
	 */
	public void setEnabled(boolean enabled) {
		this.enabled = enabled;
	}

}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/
package org.eclipse.ecf.internal.provider.xmpp.search;

import org.eclipse.ecf.presence.search.SimpleCriterion;

/**
 * Implement specific for ICriterion
 * @since 3.0
 */
public class XMPPSimpleCriterion extends SimpleCriterion {

	public XMPPSimpleCriterion(String field, String value, String operator,
			boolean ignoreCase) {
		super(field, value, operator, ignoreCase);

	}

	public XMPPSimpleCriterion(String field, String value, String operator) {
		super(field, value, operator);
	}
	
	/**
	 * Provide the expression compose just for the value
	 */
	public String toExpression() {
		return value;
	}
}




			<arguments>
			</arguments>
		</buildCommand>
		<buildCommand>
			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
	</buildSpec>
	<natures>
		<nature>org.eclipse.pde.PluginNature</nature>
		<nature>org.eclipse.jdt.core.javanature</nature>
		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
	</natures>
</projectDescription>




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/
package org.ecllpse.ecf.tests.provider.xmpp.search;

import java.util.Iterator;

import org.eclipse.ecf.core.ContainerConnectException;
import org.eclipse.ecf.core.IContainer;
import org.eclipse.ecf.core.identity.ID;
import org.eclipse.ecf.presence.search.AbstractUserSearchManager;
import org.eclipse.ecf.presence.search.ICriteria;
import org.eclipse.ecf.presence.search.ICriterion;
import org.eclipse.ecf.presence.search.IResult;
import org.eclipse.ecf.presence.search.IResultList;
import org.eclipse.ecf.presence.search.ISearch;
import org.eclipse.ecf.presence.search.IRestriction;
import org.eclipse.ecf.presence.search.IUserSearchCompleteEvent;
import org.eclipse.ecf.presence.search.IUserSearchEvent;
import org.eclipse.ecf.presence.search.IUserSearchListener;
import org.eclipse.ecf.presence.search.IUserSearchManager;
import org.eclipse.ecf.tests.presence.AbstractSearchTest;
import org.ecllpse.ecf.tests.provider.xmpp.XMPP;

/**
 * 
 * @since 3.0
 */
public class XMPPSearchTest extends AbstractSearchTest {

	private static final String USERNAME = "Username";
	private static final String EMAIL = "Email";
	private static final String NAME = "Name";
	IContainer client;
	IUserSearchManager searchManager;
	ISearch searchResult;
	
	protected String getClientContainerName() {
		return XMPP.CONTAINER_NAME;
	}

	public void testRetrieveBuddiesAsync() throws Exception {
		assertNotNull(searchManager);

		IRestriction selection = searchManager.createSelection();
		
		assertNotNull(selection);

		// fields to consider on XMPP server side search
		// search field for XMPP, criterion to match the search
		ICriterion name = selection.eq(NAME, "Marcelo*");
		ICriterion email = selection.eq(EMAIL, "zx*");
		ICriterion username = selection.eq(USERNAME, "sl*");

		// create a specific criteria
		ICriteria criteria = searchManager.createCriteria();
		assertNotNull(criteria);
		criteria.add(name);
		criteria.add(email);
		criteria.add(username);
		
		final IUserSearchEvent event = new IUserSearchEvent(){};
		
		IUserSearchListener listenerCompleted = new IUserSearchListener(){
			public void handleUserSearchEvent(IUserSearchEvent event) {
				if(event instanceof IUserSearchCompleteEvent){
					searchResult = ((IUserSearchCompleteEvent)event).getSearch();
				}
			}
		};

		((AbstractUserSearchManager) searchManager).addListener(listenerCompleted);
		
		// call the non-block search
		searchManager.search(criteria, ((AbstractUserSearchManager) searchManager).getUserSearchListner());

		//async operation that fire an event to start a user search
		Thread localThread = new Thread(new Runnable() {
			public void run() {
				((AbstractUserSearchManager) searchManager).fireUserSearchEvent(event);
			}
		});
		assertNull(searchResult);
		localThread.setDaemon(true);
		localThread.start();	
		
		Thread.sleep(5000);
		
		//put the completion result on the search handle
		assertNotNull(searchResult);

		// check if there is at least one result
		assertTrue(0 != searchResult.getResultList().geResults().size());
	}

	/**
	 * Try to locate buddies on the XMPP server in a call block way
	 * 
	 * @throws ContainerConnectException
	 */
	public void testRetrieveBuddiesAllFieldsSync()
			throws ContainerConnectException {

		try {
			assertNotNull(searchManager);

			IRestriction selection = searchManager.createSelection();
			assertNotNull(selection);

			// fields to consider on XMPP server side search
			// search field for XMPP, criterion to match the search
			ICriterion name = selection.eq(NAME, "Marcelo*");
			ICriterion email = selection.eq(EMAIL, "zx*");
			ICriterion username = selection.eq(USERNAME, "sl*");

			// create a specific criteria
			ICriteria criteria = searchManager.createCriteria();
			assertNotNull(criteria);
			criteria.add(name);
			criteria.add(email);
			criteria.add(username);

			// call the block search
			ISearch search = searchManager.search(criteria);

			// the collection of IResult
			IResultList resultList = search.getResultList();

			// check if there is at least one result
			assertTrue(0 != resultList.geResults().size());

			Iterator it = resultList.geResults().iterator();
			while (it.hasNext()) {
				IResult type = (IResult) it.next();
				System.out.println(type.getUser().getName() + " : "
						+ type.getUser().getID());

			}
		} catch (Exception e) {
			e.printStackTrace();
		}

	}

	/**
	 * Try to locate buddies on the XMPP server in a call block way
	 * 
	 * @throws ContainerConnectException
	 */
	public void testRetrieveBuddiesEmailFieldSync()
			throws Exception {

		assertNotNull(searchManager);

		IRestriction selection = searchManager.createSelection();
		assertNotNull(selection);

		// search field for XMPP, criterion to match the search
		// fields to consider on XMPP server side search
		ICriterion email = selection.eq(EMAIL, "mayworm*");

		// create a specific criteria
		ICriteria criteria = searchManager.createCriteria();
		assertNotNull(criteria);
		criteria.add(email);

		// call the block search
		ISearch search = searchManager.search(criteria);

		// the collection of IResult
		IResultList resultList = search.getResultList();

		// check if there is at least one result
		assertTrue(1 == resultList.geResults().size());

	}

	/**
	 * Try to locate buddies on the XMPP server in a call block way
	 * 
	 * @throws ContainerConnectException
	 */
	public void testRetrieveBuddiesNameFieldSync()
			throws Exception {

		assertNotNull(searchManager);

		IRestriction selection = searchManager.createSelection();
		assertNotNull(selection);

		// fields to consider on XMPP server side search
		// search field for XMPP, criterion to match the search
		ICriterion name = selection.eq(NAME, "marcelo*");

		// create a specific criteria
		ICriteria criteria = searchManager.createCriteria();
		assertNotNull(criteria);
		// criteria.add(searchCriterion);
		criteria.add(name);

		// call the block search
		ISearch search = searchManager.search(criteria);

		// the collection of IResult
		IResultList resultList = search.getResultList();

		// check if there is at least one result
		assertTrue(1 == resultList.geResults().size());

	}

	protected void setUp() throws Exception {
		super.setUp();
		final int clientIndex = 0;
		client = getClient(clientIndex);
		assertNull(client.getConnectedID());
		final ID serverConnectID = getServerConnectID(clientIndex);
		assertNotNull(serverConnectID);

		connectClient(client, serverConnectID, getConnectContext(clientIndex));
		assertEquals(serverConnectID, client.getConnectedID());

		searchManager = getPresenceAdapter(clientIndex).getUserSearchManager();

	}

	protected void tearDown() throws Exception {
		super.tearDown();
		client.disconnect();
	}

	public void testUserProperties() throws ContainerConnectException {
		assertNotNull(searchManager);
		String userProperties[] = searchManager.getUserPropertiesFields();

		// check if there is at least one result
		assertTrue(0 != userProperties.length);

	}


}

Lines 15-20 Link Here

(-)plugin.properties (+1 lines)
15		15
16	views.messages = Messages	16	views.messages = Messages
17	views.multiRosterView = Contacts	17	views.multiRosterView = Contacts
		18	views.userSearchView = Search Contacts
18		19
19	browse.command.label = Open Contact...	20	browse.command.label = Open Contact...
20	browse.command.tooltip = Open Contact	21	browse.command.tooltip = Open Contact

Lines 78-83 Link Here

(-)plugin.xml (+7 lines)
78	name="%views.multiRosterView">	78	name="%views.multiRosterView">
79	</view>	79	</view>
80	<view	80	<view
		81	category="org.eclipse.ecf.ui.viewcategory"
		82	class="org.eclipse.ecf.presence.ui.UserSearchView"
		83	icon="icons/contacts.gif"
		84	id="org.eclipse.ecf.presence.ui.UserSearchView"
		85	name="%views.userSearchView">
		86	</view>
		87	<view
81	allowMultiple="true"	88	allowMultiple="true"
82	category="org.eclipse.ecf.ui.viewcategory"	89	category="org.eclipse.ecf.ui.viewcategory"
83	class="org.eclipse.ecf.presence.ui.chatroom.ChatRoomManagerView"	90	class="org.eclipse.ecf.presence.ui.chatroom.ChatRoomManagerView"




MultiRosterView_CHANGE_PASSWORD_EXCEPTION=changePassword
MultiRosterView_ENTER_CHATROOM_TOOLTIP_TEXT=Show chat rooms for all accounts
MultiRosterView_AddContact = &Add Contact
MultiRosterView_SearchContact = &Search Contact

MessagesView_ClearChatLog = &Clear Chat Log
MessagesView_ClearChatLogDialogTitle = Clear Chat Log

AddContactDialog_Alias = Alias:
AddContactDialog_Account = Account:

SearchContactDialog_DialogTitle = Search Contact
SearchContactDialog = Search
SearchContactDialog_InfoSearching = The following fields are available\nfor searching. Wildcard(*)\ncharacters are allowed as part the\nof query.
SearchContactDialog_InfoSearchFields= Search Fields
SearchContactDialog_InfoContactFields = Search Results
SearchContactDialog_ButtonSearch = Search
SearchContactDialog_ButtonStop = Stop
SearchContactDialog_ButtonAddContact = Add Contact
SearchContactDialog_ContactInfo=Contact Info
SearchContactDialog_RunInBackground=Run in background
SearchContactDialog_RunInBackGroundToolTip=Run long operations in the background where possible
SearchContactDialog_TableResultColumnName=Name
SearchContactDialog_TableResultColumnUsername=ID
SearchContactDialog_TableSearchColumnField=Field
SearchContactDialog_TableSearchColumnValue=Value For Search
SearchContactDialog_AddContactMessage=Do you want to add the contact {0}?
SearchContactDialog_SearchingMessage=Searching...
SearchContactDialog_UserSearchJobName=Searching User...

RosterWorkbenchAdapterFactory_Mode = Mode: {0} 
RosterWorkbenchAdapterFactory_Type = Type: {0} 
RosterWorkbenchAdapterFactory_Account = Account: {0}

ChatRoomPreferencePage_CHATROOM_SHOW_USER_PRESENCE_TEXT=&Show user entry and exit messages
 
ChatRoomPreferencePage_SCROLL_OUTPUT_ON_INPUT=Scroll &output to bottom on user input
UserSearchLabelProvider_ContactsFound=\ contacts found




	public static String MultiRosterView_ShowOffline;
	public static String MultiRosterView_ShowEmptyGroups;
	public static String MultiRosterView_AddContact;
	public static String MultiRosterView_SearchContact;

	public static String MessagesView_ClearChatLog;
	public static String MessagesView_ClearChatLogDialogTitle;

	public static String AddContactDialog_Alias;
	public static String AddContactDialog_Account;

	public static String SearchContactDialog_DialogTitle;
	public static String SearchContactDialog;
	public static String SearchContactDialog_InfoSearching;
	public static String SearchContactDialog_InfoSearchFields;
	public static String SearchContactDialog_InfoContactFields;
	public static String SearchContactDialog_ButtonSearch;
	public static String SearchContactDialog_ButtonStop;
	public static String SearchContactDialog_ButtonAddContact;

	public static String SearchContactDialog_ContactInfo;

	public static String SearchContactDialog_AddContactMessage;

	public static String SearchContactDialog_RunInBackground;

	public static String SearchContactDialog_RunInBackGroundToolTip;

	public static String SearchContactDialog_SearchingMessage;

	public static String SearchContactDialog_TableResultColumnName;

	public static String SearchContactDialog_TableResultColumnUsername;

	public static String SearchContactDialog_TableSearchColumnField;

	public static String SearchContactDialog_TableSearchColumnValue;

	public static String SearchContactDialog_UserSearchJobName;

	public static String ReceiveAuthorizeRequestDialog_AUTH_REQUEST_FROM;

	public static String ReceiveAuthorizeRequestDialog_BUTTON_AUTHORIZE_AND_ADD;


	public static String ChatRoomPreferencePage_SCROLL_OUTPUT_ON_INPUT;

	public static String UserSearchLabelProvider_ContactsFound;

	static {
		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
	}

Lines 97-102 Link Here

(-)src/org/eclipse/ecf/presence/ui/MultiRosterView.java (+24 lines)
97		97
98	private IAction addContactAction;	98	private IAction addContactAction;
99		99
		100	private IAction searchContactAction;
		101
100	private IAction openChatRoomAction;	102	private IAction openChatRoomAction;
101		103
102	private IAction openAccountChatRoomAction;	104	private IAction openAccountChatRoomAction;
Lines 480-485 Link Here
480	}	482	}
481	};	483	};
482		484
		485	searchContactAction = new Action() {
		486	public void run() {
		487	IStructuredSelection iss = (IStructuredSelection) treeViewer.getSelection();
		488	IRoster roster = (IRoster) iss.getFirstElement();
		489	MultiRosterAccount account = findAccountForUser(roster.getUser().getID());
		490	if (account != null) {
		491	SearchContactDialog dialog = new SearchContactDialog(treeViewer.getControl().getShell(), account);
		492	dialog.open();
		493	}
		494	}
		495	};
		496
		497	searchContactAction.setText(Messages.MultiRosterView_SearchContact);
		498
483	openChatRoomAction = new Action() {	499	openChatRoomAction = new Action() {
484	public void run() {	500	public void run() {
485	selectAndJoinChatRoomForAccounts((MultiRosterAccount[]) rosterAccounts.toArray(new MultiRosterAccount[] {}));	501	selectAndJoinChatRoomForAccounts((MultiRosterAccount[]) rosterAccounts.toArray(new MultiRosterAccount[] {}));
Lines 618-623 Link Here
618	}	634	}
619	manager.add(addContactAction);	635	manager.add(addContactAction);
620	manager.add(new Separator());	636	manager.add(new Separator());
		637	//add if the provider supports user search
		638	if (((IRoster) element).getPresenceContainerAdapter().getUserSearchManager().isEnabled()) {
		639	manager.add(searchContactAction);
		640	manager.add(new Separator());
		641	}
621	manager.add(openAccountChatRoomAction);	642	manager.add(openAccountChatRoomAction);
622	manager.add(new Separator());	643	manager.add(new Separator());
623	manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));	644	manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
Lines 701-706 Link Here
701	showOfflineAction.setEnabled(enabled);	722	showOfflineAction.setEnabled(enabled);
702	showEmptyGroupsAction.setEnabled(enabled);	723	showEmptyGroupsAction.setEnabled(enabled);
703	addContactAction.setEnabled(enabled);	724	addContactAction.setEnabled(enabled);
		725	searchContactAction.setEnabled(enabled);
704	openChatRoomAction.setEnabled(enabled);	726	openChatRoomAction.setEnabled(enabled);
705	disconnectAllAccountsAction.setEnabled(enabled);	727	disconnectAllAccountsAction.setEnabled(enabled);
706	}	728	}
Lines 722-727 Link Here
722	manager.add(new Separator());	744	manager.add(new Separator());
723	manager.add(addContactAction);	745	manager.add(addContactAction);
724	manager.add(new Separator());	746	manager.add(new Separator());
		747	manager.add(searchContactAction);
		748	manager.add(new Separator());
725	manager.add(openChatRoomAction);	749	manager.add(openChatRoomAction);
726	manager.add(new Separator());	750	manager.add(new Separator());
727	manager.add(disconnectAllAccountsAction);	751	manager.add(disconnectAllAccountsAction);




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/
package org.eclipse.ecf.presence.ui;

import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.runtime.Assert;
import org.eclipse.ecf.core.util.ECFException;
import org.eclipse.ecf.internal.presence.ui.Activator;
import org.eclipse.ecf.internal.presence.ui.Messages;
import org.eclipse.ecf.presence.IPresenceContainerAdapter;
import org.eclipse.ecf.presence.roster.IRosterSubscriptionSender;
import org.eclipse.ecf.presence.search.IResult;
import org.eclipse.ecf.presence.search.IResultList;
import org.eclipse.ecf.ui.SharedImages;
import org.eclipse.jface.action.*;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.*;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.*;
import org.eclipse.ui.part.PageBook;
import org.eclipse.ui.part.ViewPart;

/**
 * View class for displaying multiple users that match a search in a tree viewer. This view part
 * provides the ability to display multiple users in a single tree viewer. This class may be subclassed as
 * desired to add or customize behavior.
 */
public class UserSearchView extends ViewPart {

	public static final String VIEW_ID = "org.eclipse.ecf.presence.ui.UserSearchView"; //$NON-NLS-1$

	protected static final int DEFAULT_EXPAND_LEVEL = 3;

	protected TreeViewer treeViewer;

	protected List users = new ArrayList();

	private IAction addContactAction;

	private MultiRosterAccount account;

	private PageBook pageBook;

	private Label helpMessageLabel;

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
	 */
	public void createPartControl(Composite parent) {
		pageBook = new PageBook(parent, SWT.NONE);

		createHelpMessage(pageBook);
		setupTreeViewer(pageBook);

		if (users.size() == 0)
			pageBook.showPage(helpMessageLabel);
	}

	private void createHelpMessage(Composite parent) {
		if (!parent.isDisposed()) {
			helpMessageLabel = new Label(parent, SWT.TOP + SWT.LEFT + SWT.WRAP);
		}
	}

	protected void setupTreeViewer(Composite parent) {
		treeViewer = new TreeViewer(parent, SWT.BORDER | SWT.SINGLE | SWT.V_SCROLL);
		getSite().setSelectionProvider(treeViewer);
		treeViewer.setContentProvider(new UserSearchContentProvider());
		treeViewer.setLabelProvider(new UserSearchLabelProvider());
		makeActions();
		hookContextMenu();

	}

	private void makeActions() {

		addContactAction = new Action(Messages.MultiRosterView_AddContact, SharedImages.getImageDescriptor(SharedImages.IMG_ADD_BUDDY)) {
			public void run() {
				ITreeSelection selection = (ITreeSelection) treeViewer.getSelection();
				IResult contact = (IResult) selection.getFirstElement();
				if (MessageDialog.openConfirm(null, Messages.AddContactDialog_DialogTitle, NLS.bind(Messages.SearchContactDialog_AddContactMessage, contact.getUser().getName()))) {
					IPresenceContainerAdapter ipca = account.getPresenceContainerAdapter();
					IRosterSubscriptionSender sender = ipca.getRosterManager().getRosterSubscriptionSender();
					try {
						sender.sendRosterAdd(contact.getUser().getID().getName(), contact.getUser().getName(), null);
					} catch (ECFException e) {
						Activator.getDefault().getLog().log(e.getStatus());
					}
				}

			}
		};

	}

	private void hookContextMenu() {
		MenuManager menuMgr = new MenuManager();
		menuMgr.setRemoveAllWhenShown(true);
		menuMgr.addMenuListener(new IMenuListener() {
			public void menuAboutToShow(IMenuManager manager) {
				fillContextMenu(manager);
			}
		});
		Menu menu = menuMgr.createContextMenu(treeViewer.getControl());
		treeViewer.getControl().setMenu(menu);
		getSite().registerContextMenu(menuMgr, treeViewer);
	}

	private void fillContextMenu(IMenuManager manager) {
		IStructuredSelection iss = (IStructuredSelection) treeViewer.getSelection();
		Object element = iss.getFirstElement();
		if (element instanceof IResult) {
			manager.add(addContactAction);
		}
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.ui.part.WorkbenchPart#dispose()
	 */
	public void dispose() {
		treeViewer = null;
		users.clear();
		super.dispose();
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
	 */
	public void setFocus() {
		treeViewer.getControl().setFocus();
	}

	/**
	 * Add the list of {@link IResult} that will be display on a tree
	 * @param list
	 * @return boolean
	 */
	public boolean addResult(IResultList list) {
		users.clear();
		users.add(list);
		treeViewer.setInput(users);
		pageBook.showPage(treeViewer.getControl());
		treeViewer.expandToLevel(DEFAULT_EXPAND_LEVEL);
		helpMessageLabel.setText("");
		return true;
	}

	/**
	 * Add the MultiRosterAccount for add user contact
	 * @param account
	 * @return boolean
	 */
	public boolean addMultiRosterAccount(MultiRosterAccount multiRosterAccount) {
		Assert.isNotNull(multiRosterAccount);
		this.account = multiRosterAccount;
		return true;
	}

	/**
	 * Show a message into the view before show the result in a tree view
	 * @param string
	 */
	public void showMessage(String message) {
		helpMessageLabel.setText(message);
		pageBook.showPage(helpMessageLabel);
	}

}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/
package org.eclipse.ecf.internal.presence.ui.dialogs;

import java.util.Iterator;
import org.eclipse.core.runtime.*;
import org.eclipse.ecf.core.ContainerConnectException;
import org.eclipse.ecf.core.util.ECFException;
import org.eclipse.ecf.internal.presence.ui.Activator;
import org.eclipse.ecf.internal.presence.ui.Messages;
import org.eclipse.ecf.presence.IPresenceContainerAdapter;
import org.eclipse.ecf.presence.roster.IRosterSubscriptionSender;
import org.eclipse.ecf.presence.search.*;
import org.eclipse.ecf.presence.ui.MultiRosterAccount;
import org.eclipse.ecf.presence.ui.UserSearchView;
import org.eclipse.jface.dialogs.*;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.TableEditor;
import org.eclipse.swt.events.*;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.*;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.progress.UIJob;

/**
 * 
 * @since 3.0
 *
 */
public class SearchContactDialog extends Dialog {

	Button closeButton;

	Button searchButton;

	MultiRosterAccount account;

	Button addContactButton;

	Button runInBackgroundButton;

	Table tableResult;

	Table tableFields;

	public SearchContactDialog(Shell parentShell, MultiRosterAccount account) {
		super(parentShell);
		this.account = account;

	}

	protected void addListeners() {

		searchButton.addMouseListener(new MouseAdapter() {
			public void mouseUp(MouseEvent e) {
				IUserSearchManager userManager = account.getPresenceContainerAdapter().getUserSearchManager();
				try {
					//selection to build the criteria
					IRestriction selection = userManager.createSelection();
					//create a specific criteria 
					final ICriteria criteria = userManager.createCriteria();
					//fields to consider on XMPP server side search
					TableItem items[] = tableFields.getItems();
					for (int i = 0; i < items.length; i++) {
						TableItem item = items[i];
						if (item.getChecked()) {
							//build criterion field=value
							ICriterion criterion = selection.eq(item.getText(0), item.getText(1));
							criteria.add(criterion);
						}
					}
					//Run in a block or non-block way using the criteria built previously
					if (runInBackgroundButton.getSelection()) {
						callAsynchronous(userManager, criteria);
						//close the UI
						close();
					} else {
						//call the block search
						ISearch search = userManager.search(criteria);
						//the collection of IResult
						IResultList resultList = search.getResultList();
						//clean the table for a new result list
						tableResult.removeAll();
						for (Iterator iterator = resultList.geResults().iterator(); iterator.hasNext();) {
							IResult result = (IResult) iterator.next();
							TableItem item = new TableItem(tableResult, SWT.NONE);
							item.setText(0, result.getUser().getName());
							item.setText(1, result.getUser().getID().getName());
						}
					}

				} catch (UserSearchException e1) {
					Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, e1.getLocalizedMessage(), e1));
				}
			}
		});

		addContactButton.addMouseListener(new MouseAdapter() {
			public void mouseUp(MouseEvent e) {
				TableItem contact = tableResult.getSelection()[0];
				if (MessageDialog.openConfirm(null, Messages.AddContactDialog_DialogTitle, NLS.bind(Messages.SearchContactDialog_AddContactMessage, contact.getText(0)))) {

					IPresenceContainerAdapter ipca = account.getPresenceContainerAdapter();
					IRosterSubscriptionSender sender = ipca.getRosterManager().getRosterSubscriptionSender();
					try {
						sender.sendRosterAdd(contact.getText(1), contact.getText(0), null);
					} catch (ECFException e1) {
						Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, e1.getLocalizedMessage(), e1));
					}
					close();
				}
			}
		});

	}

	protected void configureShell(Shell newShell) {
		super.configureShell(newShell);
		newShell.setText(Messages.SearchContactDialog_DialogTitle);
	}

	/*
	 * Create just a close button for the Dialog
	 * (non-Javadoc)
	 * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
	 */
	protected void createButtonsForButtonBar(Composite parent) {
		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.CLOSE_LABEL, true);
		closeButton = getButton(IDialogConstants.OK_ID);
		closeButton.setEnabled(true);
	}

	protected Control createDialogArea(Composite parent) {
		final int editableColumn = 1;
		try {
			parent = (Composite) super.createDialogArea(parent);
			parent.setLayout(new GridLayout(2, false));
			String fields[] = null;
			IUserSearchManager userManager = account.getPresenceContainerAdapter().getUserSearchManager();
			fields = userManager.getUserPropertiesFields();

			GridData searchButtonData = new GridData(SWT.RIGHT, GridData.FILL_HORIZONTAL, false, false, 1, 1);
			GridData addContactData = new GridData(SWT.RIGHT, GridData.FILL_HORIZONTAL, true, false, 1, 1);

			Group group = new Group(parent, SWT.SHADOW_ETCHED_IN);
			group.setLayout(new GridLayout(2, false));
			group.setText(Messages.SearchContactDialog_InfoSearchFields);

			Group groupContact = new Group(parent, SWT.SHADOW_ETCHED_IN);
			groupContact.setLayout(new GridLayout(2, false));
			groupContact.setText(Messages.SearchContactDialog_InfoContactFields);

			tableResult = new Table(groupContact, SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION);
			tableResult.setLinesVisible(true);
			tableResult.setHeaderVisible(true);
			GridData dataTable = new GridData(GridData.FILL_HORIZONTAL, GridData.FILL_VERTICAL, true, true, 2, 1);
			dataTable.heightHint = 200;
			tableResult.setLayoutData(dataTable);

			new TableColumn(tableResult, SWT.NONE).setText(Messages.SearchContactDialog_TableResultColumnName);
			new TableColumn(tableResult, SWT.NONE).setText(Messages.SearchContactDialog_TableResultColumnUsername);
			new TableItem(tableResult, SWT.NONE);

			for (int i = 0; i < 2; i++) {
				tableResult.getColumn(i).setWidth(130);
			}

			addContactButton = new Button(groupContact, SWT.PUSH | SWT.RIGHT);
			addContactButton.setText(Messages.SearchContactDialog_ButtonAddContact);
			addContactButton.setLayoutData(addContactData);

			tableFields = new Table(group, SWT.BORDER | SWT.MULTI | SWT.CHECK);
			tableFields.setLinesVisible(true);
			tableFields.setHeaderVisible(true);
			dataTable = new GridData(GridData.FILL_HORIZONTAL, GridData.FILL_VERTICAL, true, true, 2, 1);
			dataTable.heightHint = 200;
			tableFields.setLayoutData(dataTable);

			TableColumn colField = new TableColumn(tableFields, SWT.NONE);
			colField.setText(Messages.SearchContactDialog_TableSearchColumnField);
			TableColumn colValue = new TableColumn(tableFields, SWT.NONE);
			colValue.setText(Messages.SearchContactDialog_TableSearchColumnValue);
			colValue.setWidth(130);

			for (int i = 0; i < fields.length; i++) {
				TableItem item = new TableItem(tableFields, SWT.NONE);
				item.setText(new String[] {fields[i], ""}); //$NON-NLS-1$
				item.setChecked(true);
			}

			TableItem[] items = tableFields.getItems();
			for (int i = 0; i < items.length; i++) {
				final TableEditor editor = new TableEditor(tableFields);
				Text text = new Text(tableFields, SWT.NONE);
				text.setText(items[i].getText(editableColumn));
				text.addModifyListener(new ModifyListener() {
					public void modifyText(ModifyEvent e) {
						editor.getItem().setText(editableColumn, ((Text) editor.getEditor()).getText());
					}
				});
				text.selectAll();
				text.setFocus();
				editor.grabHorizontal = true;
				editor.setEditor(text, items[i], editableColumn);

			}
			colField.pack();

			runInBackgroundButton = new Button(group, SWT.CHECK);
			runInBackgroundButton.setText(Messages.SearchContactDialog_RunInBackground);
			runInBackgroundButton.setToolTipText(Messages.SearchContactDialog_RunInBackGroundToolTip);

			searchButton = new Button(group, SWT.PUSH | SWT.RIGHT);
			searchButton.setText(Messages.SearchContactDialog_ButtonSearch);
			searchButton.setLayoutData(searchButtonData);

		} catch (ContainerConnectException e) {
			Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, e.getLocalizedMessage(), e));
			new Label(parent, SWT.LEFT).setText(e.getLocalizedMessage());
		}
		addListeners();
		applyDialogFont(parent);
		return parent;
	}

	/**
	 * Call the user search and open the view 
	 * asynchronous
	 * @param userManager
	 * @param criteria
	 */
	protected void callAsynchronous(final IUserSearchManager userManager, final ICriteria criteria) {
		new UIJob(Messages.SearchContactDialog_UserSearchJobName) {
			public IStatus runInUIThread(IProgressMonitor monitor) {
				try {
					final UserSearchView view = (UserSearchView) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(UserSearchView.VIEW_ID);
					view.showMessage(Messages.SearchContactDialog_SearchingMessage);
					view.addMultiRosterAccount(account);
					IResultList resultList = userManager.search(criteria).getResultList();
					view.addResult(resultList);
				} catch (PartInitException e) {
					Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, e.getLocalizedMessage(), e));
					return Status.CANCEL_STATUS;
				} catch (UserSearchException e) {
					Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, e.getLocalizedMessage(), e));
					return Status.CANCEL_STATUS;
				}
				return Status.OK_STATUS;
			}
		}.schedule(3000);
	}

}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/
package org.eclipse.ecf.presence.ui;

import org.eclipse.ecf.internal.presence.ui.Messages;
import org.eclipse.ecf.presence.search.IResult;
import org.eclipse.ecf.presence.search.IResultList;
import org.eclipse.ecf.ui.SharedImages;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;

/**
 * Label provider for multiple users viewer. This label provider implements an
 * LabelProvider suitable for use by viewers that accepts LabelProvider as
 * input. This class may be subclassed in order to customize the
 * behavior/display of other label providers.
 * 
 */
public class UserSearchLabelProvider extends LabelProvider {

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
	 */
	public Image getImage(Object element) {
		if (element instanceof IResultList)
			return SharedImages.getImage(SharedImages.IMG_GROUP);
		if (element instanceof IResult)
			return SharedImages.getImage(SharedImages.IMG_USER_AVAILABLE);

		return null;
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
	 */
	public String getText(Object element) {
		if (element instanceof IResult) {
			return ((IResult) element).getUser().getName();
		} else if (element instanceof IResultList) {
			return ((IResultList) element).geResults().size() + Messages.UserSearchLabelProvider_ContactsFound;
		}
		return element.toString();
	}

}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/
package org.eclipse.ecf.presence.ui;

import java.util.List;
import org.eclipse.ecf.presence.search.IResultList;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;

/**
 * Content provider for multiple users viewer. This content provider implements
 * an ITreeContentProvider suitable for use by tree viewers that accepts
 * ITreeContentProviders as input. This class may be subclassed in order to
 * customize the behavior/display of other content providers.
 * 
 */
public class UserSearchContentProvider implements ITreeContentProvider {

	protected static Object[] EMPTY_ARRAY = new Object[0];

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
	 */
	public Object[] getChildren(Object parentElement) {
		if (parentElement instanceof IResultList) {
			return ((IResultList) parentElement).geResults().toArray();
		}
		return EMPTY_ARRAY;
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
	 */
	public Object getParent(Object element) {
		if (element == null) {
			return null;
		}
		return element;
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
	 */
	public boolean hasChildren(Object element) {
		if (element instanceof IResultList) {
			IResultList list = (IResultList) element;
			if (list.geResults().size() > 0)
				return true;
		}
		return false;
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
	 */
	public Object[] getElements(Object inputElement) {
		if (inputElement instanceof List)
			return ((List) inputElement).toArray();

		return null;

	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
	 */
	public void dispose() {
		// do nothing
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
	 *      java.lang.Object, java.lang.Object)
	 */
	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
		// do nothing
	}

}

Lines 14-19 Link Here

(-)src/org/eclipse/ecf/presence/IPresenceContainerAdapter.java (+11 lines)
14	import org.eclipse.ecf.presence.chatroom.IChatRoomManager;	14	import org.eclipse.ecf.presence.chatroom.IChatRoomManager;
15	import org.eclipse.ecf.presence.im.IChatManager;	15	import org.eclipse.ecf.presence.im.IChatManager;
16	import org.eclipse.ecf.presence.roster.IRosterManager;	16	import org.eclipse.ecf.presence.roster.IRosterManager;
		17	import org.eclipse.ecf.presence.search.IUserSearchManager;
17		18
18	/**	19	/**
19	* Entry point presence container adapter. For setting up listeners for presence	20	* Entry point presence container adapter. For setting up listeners for presence
Lines 71-74 Link Here
71	* available, returns <code>null</code>.	72	* available, returns <code>null</code>.
72	*/	73	*/
73	public IChatRoomManager getChatRoomManager();	74	public IChatRoomManager getChatRoomManager();
		75
		76	/**
		77	* Retrieve interface for search on the provide. The returned
		78	* IUserSearchManager (if not <code>null</code>) can be used to search users
		79	* related to the same provider.
		80	*
		81	* @return IUserSearchManager. <code>null</code> if no search
		82	* available for this provider.
		83	*/
		84	public IUserSearchManager getUserSearchManager();
74	}	85	}

Lines 12-17 Link Here

(-)META-INF/MANIFEST.MF (+1 lines)
12	org.eclipse.ecf.presence.history,	12	org.eclipse.ecf.presence.history,
13	org.eclipse.ecf.presence.im,	13	org.eclipse.ecf.presence.im,
14	org.eclipse.ecf.presence.roster,	14	org.eclipse.ecf.presence.roster,
		15	org.eclipse.ecf.presence.search,
15	org.eclipse.ecf.presence.service	16	org.eclipse.ecf.presence.service
16	Bundle-ManifestVersion: 2	17	Bundle-ManifestVersion: 2
17	Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,	18	Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/
package org.eclipse.ecf.presence.search;

/**
 * This event indicate that a user search was completed
 *@since 3.0
 */
public interface IUserSearchCompleteEvent extends IUserSearchEvent {

	/**
	 * Provide the result for a non-blocking search
	 * @return ISearch
	 */
	public ISearch getSearch();
}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/
package org.eclipse.ecf.presence.search;

import java.util.*;
import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.ecf.internal.presence.PresencePlugin;

/**
 * This Class implements {@link IResultList}. Subclasses may be created as
 * appropriate.
 * @since 3.0
 */
public class ResultList implements IResultList {

	protected Set results;

	/**
	 * Create a new synchronized result list from a existing one
	 * @param existingResults
	 */
	public ResultList(Collection /* <IResult> */existingResults) {
		results = Collections.synchronizedSet(new HashSet());
		if (existingResults != null)
			addAll(existingResults);
	}

	/**
	 * Create a new synchronized result list from a existing one
	 *
	 */
	public ResultList() {
		results = Collections.synchronizedSet(new HashSet());
	}

	/**
	 * Add an item for the result list
	 * @param item
	 * @return boolean
	 */
	public boolean add(IResult item) {
		if (item == null)
			return false;
		if (results.add(item))
			return true;
		return false;
	}

	/**
	 * Add the list for the current result list
	 * @param existingResults
	 */
	public void addAll(Collection /* <IResult> */existingResults) {
		if (existingResults == null)
			return;
		synchronized (results) {
			for (Iterator i = existingResults.iterator(); i.hasNext();) {
				add((IResult) i.next());
			}
		}
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.ecf.ui.presence.search.IResultList#getEntries()
	 */
	public Collection geResults() {
		return results;
	}

	public boolean remove(IResult item) {
		return results.remove(item);
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.ecf.ui.presence.search.IResultList#getResult
	 */
	public IResult getResult(String field, String value) {
		// TODO 
		return null;
	}

	public Object getAdapter(Class adapter) {
		if (adapter.isInstance(this)) {
			return this;
		}
		IAdapterManager adapterManager = PresencePlugin.getDefault().getAdapterManager();
		if (adapterManager == null)
			return null;
		return adapterManager.loadAdapter(this, adapter.getName());
	}

}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/

package org.eclipse.ecf.presence.search;

import java.util.List;

/**
 * Criteria helps for retrieving results from the provider search by composing Criterion objects. 
 * The {@link IUserSearchManager} is a factory for Criteria. Criterion instances are obtained via ISelection methods.
 * Criteria can deal with different kind of criterion, as logical or just simple expression.
 * 
 *  The typical usage of the Criteria is as
 * follows:
 * 
 * <pre>
 *      ISelection selection = ...
 *		ICriterion name = selection.eq("name", "value");
 *		ICriterion host = selection.eq("host", "value");
 *		ICriterion and = selection.and(name, host);
 *		ICriteria criteria = ...
 *		criteria.add(and);
 * </pre>
 * 
 * @since 3.0
 */
public interface ICriteria {

	/**
	 * Add a criterion that composes the criteria
	 * @param criterion
	 */
	public void add(ICriterion criterion);

	/**
	 * A list of all criterion added to the criteria
	 * @return List of {@link ICriterion}
	 */
	public List getCriterions();

	/**
	 * Notify if there is or not criterion added for this criteria
	 * @return indicate if there are or not criterion
	 */
	public boolean isEmpty();

}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/
package org.eclipse.ecf.presence.search;

/**
 * Base class implementation of {@link ICriterion} for logical criterion. 
 * Subclasses may be created as appropriate. It is just a simple 
 * implementation that can be considered for some provider or even used 
 * as base for some implementation.
 * @since 3.0
 */
public class LogicalCriterion implements ICriterion {

	final ICriterion left;
	final ICriterion right;
	final String operator;

	/**
	 * Creates a logic operation for compose a {@link ICrteria}
	 * @param left Criterion on the left side of the expression
	 * @param right Criterion on the right side of the expression
	 * @param operator Operator considered on the logical. Ex: And
	 */
	public LogicalCriterion(ICriterion left, ICriterion right, String operator) {
		this.left = left;
		this.right = right;
		this.operator = operator;
	}

	public String toExpression() {
		return left.toExpression() + ' ' + operator + ' ' + right.toExpression();
	}

	public String toString() {
		StringBuffer sb = new StringBuffer("LogicalCriterion["); //$NON-NLS-1$
		sb.append("left=").append(left).append(";"); //$NON-NLS-1$ //$NON-NLS-2$
		sb.append("right=").append(right).append(";"); //$NON-NLS-1$ //$NON-NLS-2$
		sb.append("operator=").append(operator).append("]"); //$NON-NLS-1$ //$NON-NLS-2$
		return sb.toString();
	}

}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/

package org.eclipse.ecf.presence.search;

import org.eclipse.ecf.core.ContainerConnectException;

/**
 * Get a search mechanism for an account.
 * @since 3.0
 */
public interface IUserSearchManager {

	/**
	 * Execute the search for a specific criteria, blocking until the search returns.
	 * This method can apply search to math the specific criteria in case if the 
	 * provider is not able to do it completely
	 * @param criteria 
	 * @return ISearch Contain the search results
	 * @throws UserSearchException 
	 */
	public ISearch search(ICriteria criteria) throws UserSearchException;

	/**
	 * Execute the search for a specific criteria, not blocking until the search returns.
	 * This method can apply search to math the specific criteria in case if the 
	 * provider is not able to do it completely
	 * @param criteria 
	 * @param listener the listener {@link IUserSearchListener} to search. Must not be <code>null</code>. 
	 */
	public void search(ICriteria criteria, IUserSearchListener listener);

	/**
	 * Create a specific criteria for the provider. Each provider must 
	 * implement a specific Criteria in a convenient approach for keep, 
	 * organize and deal with the {@link ICriterion}.
	 * @return {@link ICriteria}
	 */
	public ICriteria createCriteria();

	/**
	 * Create a specific {@link IRestriction} implementation for the provider. 
	 * This implementation will provide the methods to created and organize 
	 * the {@link ICriterion} that composes the search. The {@link Restriction} 
	 * is a simple implementation of this, but subclasses or new implementation 
	 * may be created as appropriate.
	 * 
	 * @return {@link IRestriction}
	 */
	public IRestriction createSelection();

	/**
	 * Each provider can inform the user properties fields
	 * to be considered on the user search, allowing the 
	 * dynamically user interface for the search.
	 * @return String[] user properties provides by server
	 * @throws ContainerConnectException 
	 */
	public String[] getUserPropertiesFields() throws ContainerConnectException;

	/**
	 * Whether this handler is capable of executing at this time.
	 * @return boolean
	 */
	public boolean isEnabled();
}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/

package org.eclipse.ecf.presence.search;

/**
 * A representation of a query criterion for a restriction in a Criteria.
 * A Criteria is formed by one or several criterion, 
 * that together are able to compose an entire expression to project 
 * a result that match the criteria. The instances of this should be 
 * created for {@link IRestriction} implementations.
 * @since 3.0
 */
public interface ICriterion {

	/**
	 * Returns a expression composed for the search.
	 * The String can be something like 'field' + 'operator' + value, 
	 * that it will be interpreted for each specific provider.
	 * @return String
	 */
	public String toExpression();
}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/
package org.eclipse.ecf.presence.search;

/**
 * An event received by a user search. This interface address the events 
 * that happens on user search API. There be different sub-interfaces of IUserSearchEvent to
 * represent different types of events.
 * @since 3.0
 */
public interface IUserSearchEvent {
	//
}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/
package org.eclipse.ecf.presence.search;

/**
 * 
 * @since 3.0
 */
public class UserSearchCompleteEvent implements IUserSearchCompleteEvent {

	private ISearch search;

	public UserSearchCompleteEvent(ISearch search) {
		this.search = search;
	}

	public ISearch getSearch() {
		return search;
	}

}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/
package org.eclipse.ecf.presence.search;

/**
 * This Class implements {@link IRestriction}. Subclasses may be created as
 * appropriate. It is just a simple implementation that can be considered 
 * for some provider or even used as base for some implementation.
 * @since 3.0
 */
public class Restriction implements IRestriction {

	/** Operator Equal */
	public static final String OPERATOR_EQ = "="; //$NON-NLS-1$

	/** Operator Not Equal */
	public static final String OPERATOR_NE = "!="; //$NON-NLS-1$

	/** Operator AND */
	public static final String OPERATOR_AND = "&&"; //$NON-NLS-1$

	/*
	 * (non-Javadoc)
	 * @see org.eclipse.ecf.presence.search.ISelection#and(org.eclipse.ecf.presence.search.ICriterion, org.eclipse.ecf.presence.search.ICriterion)
	 */
	public ICriterion and(ICriterion left, ICriterion right) {
		return new LogicalCriterion(left, right, OPERATOR_AND);
	}

	/*
	 * (non-Javadoc)
	 * @see org.eclipse.ecf.presence.search.ISelection#eq(java.lang.String, java.lang.String)
	 */
	public ICriterion eq(String field, String value) {
		return new SimpleCriterion(field, value, OPERATOR_EQ);
	}

	/*
	 * (non-Javadoc)
	 * @see org.eclipse.ecf.presence.search.ISelection#ne(java.lang.String, java.lang.String)
	 */
	public ICriterion ne(String field, String value) {
		return new SimpleCriterion(field, value, OPERATOR_NE);
	}

	/*
	 * (non-Javadoc)
	 * @see org.eclipse.ecf.presence.search.ISelection#eq(java.lang.String, java.lang.String, boolean)
	 */
	public ICriterion eq(String field, String value, boolean ignoreCase) {
		//TODO implement a criterion that supports ignore case approach
		return new SimpleCriterion(field, value, OPERATOR_EQ);
	}

	/*
	 * (non-Javadoc)
	 * @see org.eclipse.ecf.presence.search.ISelection#ne(java.lang.String, java.lang.String, boolean)
	 */
	public ICriterion ne(String field, String value, boolean ignoreCase) {
		//TODO implement a criterion that supports ignore case approach
		return new SimpleCriterion(field, value, OPERATOR_NE);
	}

}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/
package org.eclipse.ecf.presence.search;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.ecf.core.util.ECFException;

/**
 * 
 * @since 3.0
 */
public class UserSearchException extends ECFException {

	/**
	 * 
	 */
	private static final long serialVersionUID = -896845055593390010L;

	private ICriteria criteria = null;

	/**
	 * 
	 */
	public UserSearchException(ICriteria criteria) {
		super();
		this.criteria = criteria;
	}

	/**
	 * @param status
	 */
	public UserSearchException(IStatus status, ICriteria criteria) {
		super(status);
		this.criteria = criteria;
	}

	/**
	 * @param message
	 * @param cause
	 */
	public UserSearchException(String message, Throwable cause, ICriteria criteria) {
		super(message, cause);
		this.criteria = criteria;
	}

	/**
	 * @param message
	 */
	public UserSearchException(String message, ICriteria criteria) {
		super(message);
		this.criteria = criteria;
	}

	/**
	 * @param cause
	 */
	public UserSearchException(Throwable cause, ICriteria criteria) {
		super(cause);
		this.criteria = criteria;
	}

	public ICriteria getSearchCriteria() {
		return this.criteria;
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/

package org.eclipse.ecf.presence.search;

/**
 * Provide access for the list of matched query results. This interface can be
 * extended to supply more features around the result list.
 * @since 3.0
 */
public interface ISearch {

	/**
	 * Gets a result list.
	 * Will not return <code>null</code>.
	 * @return IResultList list of {@link IResult} 
	 */
	IResultList getResultList();

	/**
	 * 
	 * @param IResultList
	 */
	public void setResultList(IResultList resultList);

}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/
package org.eclipse.ecf.presence.search;

/**
 * Instances implementing this interface provide methods to compose the corrects operations for each
 * provide
 * @since 3.0
 */
public interface IRestriction {

	/**
	 * Apply an "add" constraint to the two criterion
	 * @param left
	 * @param right
	 * @return ICriterion
	 */
	public ICriterion and(ICriterion left, ICriterion right);

	/**
	 * Apply an "equal" constraint to the field, ignoring case
	 * @param field
	 * @param value
	 * @return ICriterion
	 */
	public ICriterion eq(String field, String value);

	/**
	 * Apply an "not equal" constraint to the field ignoring case
	 * @param field
	 * @param value
	 * @return ICriterion
	 */
	public ICriterion ne(String field, String value);

	/**
	 * Apply an "equal" constraint to the field, taking into consideration ignore case
	 * @param field
	 * @param value
	 * @param ignoreCase
	 * @return ICriterion
	 */
	public ICriterion eq(String field, String value, boolean ignoreCase);

	/**
	 * Apply an "not equal" constraint to the field, taking into consideration ignore case
	 * @param field
	 * @param value
	 * @param ignoreCase
	 * @return ICriterion
	 */
	public ICriterion ne(String field, String value, boolean ignoreCase);

}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/
package org.eclipse.ecf.presence.search;

import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.ecf.core.user.IUser;

/**
 * Each result returned for the search will be reach through this interface.
 * The result contain the user that match the search.
 * @since 3.0
 */
public interface IResult extends IAdaptable {

	/**
	 * Get user for the search. This is the user that comes from the search.
	 * 
	 * @return IUser user associated with the search.
	 */
	public IUser getUser();
}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/
package org.eclipse.ecf.presence.search;

/** 
 * This Interface allows for implementing classes to execute the search
 * for users in a non block way.
 * Note these methods will be called asynchronously not blocking a search action.
 * The provider is free to call the methods below with an arbitrary thread, so the
 * implementation of these methods must be appropriately prepared.
 * @since 3.0
 */
public interface IUserSearchListener {

	/**
	 * Catch the event fired and proceed to complete the search.
	 * Handle the search asynchronously. Notify that the search was completed 
	 * for the specific criteria.
	 * @param event the object that contains the composition of {@link ICriteria}
	 * and deal with the results in a non-blocking way
	 */
	public void handleUserSearchEvent(IUserSearchEvent event);

}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/
package org.eclipse.ecf.presence.search;

/**
 * 
 * Base class implementation of {@link ICriterion} for simple comparisons. Subclasses may be created as
 * appropriate.
 * @since 3.0
 */
public class SimpleCriterion implements ICriterion {

	protected final String field;
	protected final String value;
	protected final String operator;
	protected final boolean ignoreCase;

	/**
	 * Constructor for a instance of {@link ICriterion}
	 * @param field Name of the field
	 * @param value Value that match the search
	 * @param operator Operator opportune for the search 
	 * @param ignoreCase Consider case or not
	 */
	public SimpleCriterion(String field, String value, String operator, boolean ignoreCase) {
		this.field = field;
		this.value = value;
		this.operator = operator;
		this.ignoreCase = ignoreCase;
	}

	/**
	 * Constructor for a instance of {@link ICriterion}. This is 
	 * ignore case
	 * @param field Name of the field
	 * @param value Value that match the search
	 * @param operator Operator opportune for the search 
	 */
	public SimpleCriterion(String field, String value, String operator) {
		this.field = field;
		this.value = value;
		this.operator = operator;
		this.ignoreCase = false;
	}

	/*
	 * (non-Javadoc)
	 * @see org.eclipse.ecf.presence.search.ICriterion#toExpression()
	 */
	public String toExpression() {
		return field + ' ' + operator + ' ' + value;
	}

	public String toString() {
		StringBuffer sb = new StringBuffer("SimpleCriterion["); //$NON-NLS-1$
		sb.append("field=").append(field).append(";"); //$NON-NLS-1$ //$NON-NLS-2$
		sb.append("value=").append(value).append(";"); //$NON-NLS-1$ //$NON-NLS-2$
		sb.append("operator=").append(operator).append(";"); //$NON-NLS-1$ //$NON-NLS-2$
		sb.append("ignoreCase=").append(ignoreCase).append("]"); //$NON-NLS-1$ //$NON-NLS-2$
		return sb.toString();
	}

	public boolean equals(Object o) {
		if (this == o) {
			return true;
		}
		if (o instanceof String) {
			return o.equals(field);
		}
		return false;
	}

	public int hashCode() {
		return (field != null ? field.hashCode() : 0);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/
package org.eclipse.ecf.presence.search;

import java.util.*;

/**
 * Abstract implementation of IUserSearchManager. Provides implementations of listener
 * methods that subsclasses may use to avoid having to implement them
 * themselves. This class may be subclassed as needed.
 * @since 3.0
 */
public abstract class AbstractUserSearchManager implements IUserSearchManager {

	private final List userSearchListeners = new ArrayList(5);
	protected ICriteria criteria;

	/**
	 * Add the listener to be notify by events
	 * @param listener
	 */
	public void addListener(IUserSearchListener l) {
		synchronized (userSearchListeners) {
			userSearchListeners.add(l);
		}
	}

	public void removeListener(IUserSearchListener l) {
		synchronized (userSearchListeners) {
			userSearchListeners.remove(l);
		}
	}

	/**
	 * Fires a user search event
	 * 
	 * @param event
	 */
	public void fireUserSearchEvent(IUserSearchEvent event) {
		List toNotify = null;
		// Copy array
		synchronized (userSearchListeners) {
			toNotify = new ArrayList(userSearchListeners);
		}
		// Notify all in toNotify
		for (Iterator i = toNotify.iterator(); i.hasNext();) {
			IUserSearchListener l = (IUserSearchListener) i.next();
			l.handleUserSearchEvent(event);
		}
	}

	/**
	 * Returns a default implementation for IUserSearchListner
	 * @return IUserSearchListener
	 */
	public IUserSearchListener getUserSearchListner() {
		return new UserListener();
	}

	public class UserListener implements IUserSearchListener {

		public void handleUserSearchEvent(IUserSearchEvent event) {
			try {
				if (event instanceof IUserSearchCompleteEvent) {
					//ISearch searchResult = ((IUserSearchCompleteEvent) event).getSearch();
				} else if (event instanceof IUserSearchEvent) {
					ISearch searchResult = search(criteria);
					fireUserSearchEvent(new UserSearchCompleteEvent(searchResult));
				}

			} catch (UserSearchException e) {
				e.printStackTrace();
			}

		}

	}

}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/

package org.eclipse.ecf.presence.search;

import java.util.Collection;
import org.eclipse.core.runtime.IAdaptable;

/**
 * This interface provides methods to handle the result list that match the search.
 * @since 3.0
 */
public interface IResultList extends IAdaptable {

	/**
	 * Get results that match the search. Instances of list are of type
	 * {@link IResult}
	 * 
	 * @return Collection of IResult. Will not return <code>null</code>.
	 *         May return an empty Collection.
	 */
	public Collection geResults();

	/**
	 * Get the result that math the specific field and value
	 * @param field field's name used as argument to try to match the search
	 * @param value value for the respective field used as argument to try to match the search
	 * @return IResult will be null case it doesn't exist
	 */
	public IResult getResult(String field, String value);
}

Lines 63-68 Link Here

(-)src/org/eclipse/ecf/internal/provider/msn/MSNContainer.java (+50 lines)
63	import org.eclipse.ecf.presence.roster.IRosterManager;	63	import org.eclipse.ecf.presence.roster.IRosterManager;
64	import org.eclipse.ecf.presence.roster.IRosterSubscriptionListener;	64	import org.eclipse.ecf.presence.roster.IRosterSubscriptionListener;
65	import org.eclipse.ecf.presence.roster.IRosterSubscriptionSender;	65	import org.eclipse.ecf.presence.roster.IRosterSubscriptionSender;
		66	import org.eclipse.ecf.presence.search.ICriteria;
		67	import org.eclipse.ecf.presence.search.ISearch;
		68	import org.eclipse.ecf.presence.search.IRestriction;
		69	import org.eclipse.ecf.presence.search.IUserSearchListener;
		70	import org.eclipse.ecf.presence.search.IUserSearchManager;
		71	import org.eclipse.ecf.presence.search.UserSearchException;
66	import org.eclipse.ecf.presence.service.IPresenceService;	72	import org.eclipse.ecf.presence.service.IPresenceService;
67	import org.eclipse.ecf.protocol.msn.ChatSession;	73	import org.eclipse.ecf.protocol.msn.ChatSession;
68	import org.eclipse.ecf.protocol.msn.Contact;	74	import org.eclipse.ecf.protocol.msn.Contact;
Lines 758-761 Link Here
758	return null;	764	return null;
759	}	765	}
760		766
		767	/**
		768	* TODO Implement a User Search Manager for MSN
		769	* for while it just returns a manger
		770	* to inform that user search is not allow
		771	* for this provider see {@link IUserSearchManager#isEnabled()}
		772	*/
		773	public IUserSearchManager getUserSearchManager() {
		774	return new IUserSearchManager(){
		775
		776	public ICriteria createCriteria() {
		777	// TODO Auto-generated method stub
		778	return null;
		779	}
		780
		781	public IRestriction createSelection() {
		782	// TODO Auto-generated method stub
		783	return null;
		784	}
		785
		786	public String[] getUserPropertiesFields()
		787	throws ContainerConnectException {
		788	// TODO Auto-generated method stub
		789	return null;
		790	}
		791
		792	public boolean isEnabled() {
		793	// TODO Auto-generated method stub
		794	return false;
		795	}
		796
		797	public ISearch search(ICriteria criteria)
		798	throws UserSearchException {
		799	// TODO Auto-generated method stub
		800	return null;
		801	}
		802
		803	public void search(ICriteria criteria, IUserSearchListener listener) {
		804	// TODO Auto-generated method stub
		805
		806	}
		807
		808	};
		809	}
		810
761	}	811	}




/*******************************************************************************
 * Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
 * program and the accompanying materials are made available under the terms of
 * the Eclipse Public License v1.0 which accompanies this distribution, and is
 * available at http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 	Marcelo Mayworm - initial API and implementation
 *
 ******************************************************************************/
package org.eclipse.ecf.tests.presence;


public abstract class AbstractSearchTest extends AbstractPresenceTestCase {

	public static final int CLIENT_COUNT = 1;
	public static final int WAITTIME = 3000;

	protected void setUp() throws Exception {
		setClientCount(CLIENT_COUNT);
		clients = createClients();
	}

}

Return to bug 256696

Lines 194-199 Link Here

(-)src/org/eclipse/ecf/internal/presence/ui/Messages.java (+32 lines)
194	public static String MultiRosterView_ShowOffline;	194	public static String MultiRosterView_ShowOffline;
195	public static String MultiRosterView_ShowEmptyGroups;	195	public static String MultiRosterView_ShowEmptyGroups;
196	public static String MultiRosterView_AddContact;	196	public static String MultiRosterView_AddContact;
		197	public static String MultiRosterView_SearchContact;
197		198
198	public static String MessagesView_ClearChatLog;	199	public static String MessagesView_ClearChatLog;
199	public static String MessagesView_ClearChatLogDialogTitle;	200	public static String MessagesView_ClearChatLogDialogTitle;
Lines 209-214 Link Here
209	public static String AddContactDialog_Alias;	210	public static String AddContactDialog_Alias;
210	public static String AddContactDialog_Account;	211	public static String AddContactDialog_Account;
211		212
		213	public static String SearchContactDialog_DialogTitle;
		214	public static String SearchContactDialog;
		215	public static String SearchContactDialog_InfoSearching;
		216	public static String SearchContactDialog_InfoSearchFields;
		217	public static String SearchContactDialog_InfoContactFields;
		218	public static String SearchContactDialog_ButtonSearch;
		219	public static String SearchContactDialog_ButtonStop;
		220	public static String SearchContactDialog_ButtonAddContact;
		221
		222	public static String SearchContactDialog_ContactInfo;
		223
		224	public static String SearchContactDialog_AddContactMessage;
		225
		226	public static String SearchContactDialog_RunInBackground;
		227
		228	public static String SearchContactDialog_RunInBackGroundToolTip;
		229
		230	public static String SearchContactDialog_SearchingMessage;
		231
		232	public static String SearchContactDialog_TableResultColumnName;
		233
		234	public static String SearchContactDialog_TableResultColumnUsername;
		235
		236	public static String SearchContactDialog_TableSearchColumnField;
		237
		238	public static String SearchContactDialog_TableSearchColumnValue;
		239
		240	public static String SearchContactDialog_UserSearchJobName;
		241
212	public static String ReceiveAuthorizeRequestDialog_AUTH_REQUEST_FROM;	242	public static String ReceiveAuthorizeRequestDialog_AUTH_REQUEST_FROM;
213		243
214	public static String ReceiveAuthorizeRequestDialog_BUTTON_AUTHORIZE_AND_ADD;	244	public static String ReceiveAuthorizeRequestDialog_BUTTON_AUTHORIZE_AND_ADD;
Lines 244-249 Link Here
244		274
245	public static String ChatRoomPreferencePage_SCROLL_OUTPUT_ON_INPUT;	275	public static String ChatRoomPreferencePage_SCROLL_OUTPUT_ON_INPUT;
246		276
		277	public static String UserSearchLabelProvider_ContactsFound;
		278
247	static {	279	static {
248	NLS.initializeMessages(BUNDLE_NAME, Messages.class);	280	NLS.initializeMessages(BUNDLE_NAME, Messages.class);
249	}	281	}

Lines 41-46 Link Here

(-)src/org/eclipse/ecf/provider/xmpp/XMPPContainer.java (+11 lines)
41	import org.eclipse.ecf.internal.provider.xmpp.events.MessageEvent;	41	import org.eclipse.ecf.internal.provider.xmpp.events.MessageEvent;
42	import org.eclipse.ecf.internal.provider.xmpp.events.PresenceEvent;	42	import org.eclipse.ecf.internal.provider.xmpp.events.PresenceEvent;
43	import org.eclipse.ecf.internal.provider.xmpp.filetransfer.XMPPOutgoingFileTransferHelper;	43	import org.eclipse.ecf.internal.provider.xmpp.filetransfer.XMPPOutgoingFileTransferHelper;
		44	import org.eclipse.ecf.internal.provider.xmpp.search.XMPPSearchManager;
44	import org.eclipse.ecf.internal.provider.xmpp.smack.ECFConnection;	45	import org.eclipse.ecf.internal.provider.xmpp.smack.ECFConnection;
45	import org.eclipse.ecf.internal.provider.xmpp.smack.ECFConnectionObjectPacketEvent;	46	import org.eclipse.ecf.internal.provider.xmpp.smack.ECFConnectionObjectPacketEvent;
46	import org.eclipse.ecf.internal.provider.xmpp.smack.ECFConnectionPacketEvent;	47	import org.eclipse.ecf.internal.provider.xmpp.smack.ECFConnectionPacketEvent;
Lines 50-55 Link Here
50	import org.eclipse.ecf.presence.chatroom.IChatRoomManager;	51	import org.eclipse.ecf.presence.chatroom.IChatRoomManager;
51	import org.eclipse.ecf.presence.im.IChatManager;	52	import org.eclipse.ecf.presence.im.IChatManager;
52	import org.eclipse.ecf.presence.roster.IRosterManager;	53	import org.eclipse.ecf.presence.roster.IRosterManager;
		54	import org.eclipse.ecf.presence.search.IUserSearchManager;
53	import org.eclipse.ecf.presence.service.IPresenceService;	55	import org.eclipse.ecf.presence.service.IPresenceService;
54	import org.eclipse.ecf.provider.comm.AsynchEvent;	56	import org.eclipse.ecf.provider.comm.AsynchEvent;
55	import org.eclipse.ecf.provider.comm.ConnectionCreateException;	57	import org.eclipse.ecf.provider.comm.ConnectionCreateException;
Lines 104-109 Link Here
104	protected XMPPOutgoingFileTransferHelper outgoingFileTransferContainerAdapter = null;	106	protected XMPPOutgoingFileTransferHelper outgoingFileTransferContainerAdapter = null;
105		107
106	protected XMPPContainerPresenceHelper presenceHelper = null;	108	protected XMPPContainerPresenceHelper presenceHelper = null;
		109
		110	protected XMPPSearchManager searchManager = null;
107		111
108	protected ID presenceHelperID = null;	112	protected ID presenceHelperID = null;
109		113
Lines 112-117 Link Here
112	this.keepAlive = keepAlive;	116	this.keepAlive = keepAlive;
113	accountManager = new XMPPContainerAccountManager();	117	accountManager = new XMPPContainerAccountManager();
114	chatRoomManager = new XMPPChatRoomManager(getID());	118	chatRoomManager = new XMPPChatRoomManager(getID());
		119	searchManager = new XMPPSearchManager();
115	this.presenceHelperID = IDFactory.getDefault().createStringID(CONTAINER_HELPER_ID);	120	this.presenceHelperID = IDFactory.getDefault().createStringID(CONTAINER_HELPER_ID);
116	presenceHelper = new XMPPContainerPresenceHelper(this);	121	presenceHelper = new XMPPContainerPresenceHelper(this);
117	outgoingFileTransferContainerAdapter = new XMPPOutgoingFileTransferHelper(this);	122	outgoingFileTransferContainerAdapter = new XMPPOutgoingFileTransferHelper(this);
Lines 132-137 Link Here
132	public IRosterManager getRosterManager() {	137	public IRosterManager getRosterManager() {
133	return presenceHelper.getRosterManager();	138	return presenceHelper.getRosterManager();
134	}	139	}
		140
		141	public IUserSearchManager getUserSearchManager() {
		142	return searchManager;
		143	}
135		144
136	public IAccountManager getAccountManager() {	145	public IAccountManager getAccountManager() {
137	return accountManager;	146	return accountManager;
Lines 238-243 Link Here
238	final ECFConnection conn = getECFConnection();	247	final ECFConnection conn = getECFConnection();
239	accountManager.setConnection(conn.getXMPPConnection());	248	accountManager.setConnection(conn.getXMPPConnection());
240	chatRoomManager.setConnection(getConnectNamespace(), originalTarget, conn);	249	chatRoomManager.setConnection(getConnectNamespace(), originalTarget, conn);
		250	searchManager.setConnection(getConnectNamespace(), originalTarget,conn);
		251	searchManager.setEnabled(!isGoogle(originalTarget));
241	presenceHelper.setUser(new User(originalTarget));	252	presenceHelper.setUser(new User(originalTarget));
242	outgoingFileTransferContainerAdapter.setConnection(conn.getXMPPConnection());	253	outgoingFileTransferContainerAdapter.setConnection(conn.getXMPPConnection());
243	return originalTarget;	254	return originalTarget;

Lines 437-443 Link Here

(-)src/org/eclipse/ecf/internal/provider/xmpp/XMPPContainerPresenceHelper.java (-160 / +50 lines)
437	final IRosterEntry entry = createRosterEntry(newID, item);	437	final IRosterEntry entry = createRosterEntry(newID, item);
438	if (itemType == RosterPacket.ItemType.NONE	438	if (itemType == RosterPacket.ItemType.NONE
439	\|\| itemType == RosterPacket.ItemType.REMOVE) {	439	\|\| itemType == RosterPacket.ItemType.REMOVE) {
440	removeFromRoster(createIDFromName(item.getUser()));	440	removeItemFromRoster(roster.getItems(),
		441	createIDFromName(item.getUser()));
441	remove = true;	442	remove = true;
442	} else {	443	} else {
443	remove = false;	444	remove = false;
Lines 459-482 Link Here
459	rosterManager.notifyRosterAdd(entry);	460	rosterManager.notifyRosterAdd(entry);
460	}	461	}
461		462
462	private void removeFromRoster(XMPPID itemIDToRemove) {	463	private void removeItemFromRoster(Collection rosterItems,
		464	XMPPID itemIDToRemove) {
463	boolean removed = false;	465	boolean removed = false;
464	Collection rosterItems = roster.getItems();
465	synchronized (rosterItems) {	466	synchronized (rosterItems) {
466	for (final Iterator i = rosterItems.iterator(); i.hasNext();) {	467	for (final Iterator i = rosterItems.iterator(); i.hasNext();) {
467	final IRosterItem item = (IRosterItem) i.next();	468	final IRosterItem item = (IRosterItem) i.next();
468	if (item instanceof org.eclipse.ecf.presence.roster.RosterGroup) {	469	if (item instanceof org.eclipse.ecf.presence.roster.RosterGroup) {
469	final org.eclipse.ecf.presence.roster.RosterGroup group = (org.eclipse.ecf.presence.roster.RosterGroup) item;	470	final org.eclipse.ecf.presence.roster.RosterGroup group = (org.eclipse.ecf.presence.roster.RosterGroup) item;
470	boolean r = removeItemFromRosterGroup(group, itemIDToRemove);	471	removed = removeItemFromRosterGroup(group, itemIDToRemove);
471	if (r)
472	removed = true;
473	// If group is empty, remove it too	472	// If group is empty, remove it too
474	if (group.getEntries().size() == 0)	473	if (group.getEntries().size() == 0)
475	i.remove();	474	i.remove();
476	} else if (item instanceof org.eclipse.ecf.presence.roster.RosterEntry) {	475	} else if (item instanceof org.eclipse.ecf.presence.roster.RosterEntry) {
477	org.eclipse.ecf.presence.roster.RosterEntry entry = (org.eclipse.ecf.presence.roster.RosterEntry) item;	476	if (((org.eclipse.ecf.presence.roster.RosterEntry) item)
478	XMPPID entryID = (XMPPID) entry.getUser().getID();	477	.getUser().getID().equals(itemIDToRemove)) {
479	if (entryID.equals(itemIDToRemove)) {
480	i.remove();	478	i.remove();
481	removed = true;	479	removed = true;
482	}	480	}
Lines 496-503 Link Here
496	for (final Iterator i = group.getEntries().iterator(); i.hasNext();) {	494	for (final Iterator i = group.getEntries().iterator(); i.hasNext();) {
497	final org.eclipse.ecf.presence.roster.RosterEntry entry = (org.eclipse.ecf.presence.roster.RosterEntry) i	495	final org.eclipse.ecf.presence.roster.RosterEntry entry = (org.eclipse.ecf.presence.roster.RosterEntry) i
498	.next();	496	.next();
499	XMPPID entryID = (XMPPID) entry.getUser().getID();	497	if (entry.getUser().getID().equals(itemIDToRemove)) {
500	if (entryID.equals(itemIDToRemove)) {
501	i.remove();	498	i.remove();
502	return true;	499	return true;
503	}	500	}
Lines 570-769 Link Here
570		567
571	private void updatePresence(XMPPID fromID, IPresence newPresence) {	568	private void updatePresence(XMPPID fromID, IPresence newPresence) {
572	final Collection rosterItems = roster.getItems();	569	final Collection rosterItems = roster.getItems();
573	AdditionalClient newEntry = null;	570	List newEntrys = new ArrayList();
574	synchronized (rosterItems) {	571	synchronized (rosterItems) {
575	for (final Iterator i = roster.getItems().iterator(); i.hasNext();) {	572	for (final Iterator i = roster.getItems().iterator(); i.hasNext();) {
576	final IRosterItem item = (IRosterItem) i.next();	573	final IRosterItem item = (IRosterItem) i.next();
577	if (item instanceof IRosterGroup) {	574	if (item instanceof IRosterGroup) {
578	AdditionalClient newClient = updatePresenceInGroup(	575	AdditionalClientRosterEntry[] es = updatePresenceInGroup(
579	(IRosterGroup) item, fromID, newPresence);	576	(IRosterGroup) item, fromID, newPresence);
580	if (newClient != null)	577	for (int j = 0; j < es.length; j++) {
581	newEntry = newClient;	578	newEntrys.add(es[j]);
		579	}
582	} else if (item instanceof org.eclipse.ecf.presence.roster.RosterEntry) {	580	} else if (item instanceof org.eclipse.ecf.presence.roster.RosterEntry) {
583	AdditionalClient newClient = updatePresenceForMatchingEntry(	581	AdditionalClientRosterEntry entry = updatePresenceForMatchingEntry(
584	(org.eclipse.ecf.presence.roster.RosterEntry) item,	582	(org.eclipse.ecf.presence.roster.RosterEntry) item,
585	fromID, newPresence);	583	fromID, newPresence);
586	if (newClient != null)	584	if (entry != null)
587	newEntry = newClient;	585	newEntrys.add(entry);
588	}	586	}
589	}	587	}
590	}	588	}
591		589
592	if (newEntry != null) {	590	AdditionalClientRosterEntry[] entrys = (AdditionalClientRosterEntry[]) newEntrys
593	if (newEntry.add) {	591	.toArray(new AdditionalClientRosterEntry[] {});
594	if (!rosterContainsEntry(fromID)) {	592	IRosterEntry entry = null;
595	IRosterEntry entry = new org.eclipse.ecf.presence.roster.RosterEntry(	593	if (entrys.length > 0) {
596	newEntry.parent, newEntry.user, newEntry.presence);	594	for (int i = 0; i < entrys.length; i++) {
597	rosterManager.notifyRosterUpdate(roster);	595	entry = new org.eclipse.ecf.presence.roster.RosterEntry(entrys[i].parent,entrys[i].user,entrys[i].presence);
598	fireSetRosterEntry(false, entry);	596	//roster.addItem(entry);
599	}
600	} else {
601	// remove from roster as it's another client
602	removeFromRoster(fromID);
603	}	597	}
		598	rosterManager.notifyRosterUpdate(roster);
		599	fireSetRosterEntry(false, entry);
604	}	600	}
605	}	601	}
606		602
607	class AdditionalClient {	603	class AdditionalClientRosterEntry {
608		604
609	IRosterItem parent;	605	IRosterItem parent;
610	IUser user;	606	IUser user;
611	IPresence presence;	607	IPresence presence;
612	boolean add;	608
613		609	public AdditionalClientRosterEntry(IRosterItem parent, IUser user, IPresence presence) {
614	public AdditionalClient(IRosterItem parent, IUser user,
615	IPresence presence, boolean add) {
616	this.parent = parent;	610	this.parent = parent;
617	this.user = user;	611	this.user = user;
618	this.presence = presence;	612	this.presence = presence;
619	this.add = add;
620	}
621
622	public AdditionalClient(IUser user) {
623	this.user = user;
624	this.add = false;
625	}
626	}
627
628	private int countClientsInRosterGroup(
629	org.eclipse.ecf.presence.roster.RosterGroup group, XMPPID oldID) {
630	Collection groupItems = group.getEntries();
631	int count = 0;
632	for (final Iterator i = groupItems.iterator(); i.hasNext();) {
633	final IRosterItem item = (IRosterItem) i.next();
634	if (item instanceof org.eclipse.ecf.presence.roster.RosterEntry) {
635	org.eclipse.ecf.presence.roster.RosterEntry entry = (org.eclipse.ecf.presence.roster.RosterEntry) item;
636	XMPPID entryID = (XMPPID) entry.getUser().getID();
637	if (entryID.getUsernameAtHost().equals(
638	oldID.getUsernameAtHost()))
639	count++;
640	}
641	}	613	}
642	return count;
643	}	614	}
644		615
645	private int countClientsInRoster(XMPPID oldID) {	616
646	Collection rosterItems = roster.getItems();	617	private AdditionalClientRosterEntry updatePresenceForMatchingEntry(
647	int count = 0;
648	synchronized (rosterItems) {
649	for (final Iterator i = rosterItems.iterator(); i.hasNext();) {
650	final IRosterItem item = (IRosterItem) i.next();
651	if (item instanceof org.eclipse.ecf.presence.roster.RosterGroup) {
652	final org.eclipse.ecf.presence.roster.RosterGroup group = (org.eclipse.ecf.presence.roster.RosterGroup) item;
653	count += countClientsInRosterGroup(group, oldID);
654	} else if (item instanceof org.eclipse.ecf.presence.roster.RosterEntry) {
655	org.eclipse.ecf.presence.roster.RosterEntry entry = (org.eclipse.ecf.presence.roster.RosterEntry) item;
656	XMPPID entryID = (XMPPID) entry.getUser().getID();
657	if (entryID.getUsernameAtHost().equals(
658	oldID.getUsernameAtHost())) {
659	count++;
660	}
661	}
662	}
663	}
664	return count;
665	}
666
667	private boolean rosterGroupContainsEntry(
668	org.eclipse.ecf.presence.roster.RosterGroup group, XMPPID oldID) {
669	Collection groupItems = group.getEntries();
670	for (final Iterator i = groupItems.iterator(); i.hasNext();) {
671	final IRosterItem item = (IRosterItem) i.next();
672	if (item instanceof org.eclipse.ecf.presence.roster.RosterEntry) {
673	org.eclipse.ecf.presence.roster.RosterEntry entry = (org.eclipse.ecf.presence.roster.RosterEntry) item;
674	XMPPID entryID = (XMPPID) entry.getUser().getID();
675	if (entryID.equals(oldID))
676	return true;
677	}
678	}
679	return false;
680	}
681
682	private boolean rosterContainsEntry(XMPPID oldID) {
683	Collection rosterItems = roster.getItems();
684	synchronized (rosterItems) {
685	for (final Iterator i = rosterItems.iterator(); i.hasNext();) {
686	final IRosterItem item = (IRosterItem) i.next();
687	if (item instanceof org.eclipse.ecf.presence.roster.RosterGroup) {
688	final org.eclipse.ecf.presence.roster.RosterGroup group = (org.eclipse.ecf.presence.roster.RosterGroup) item;
689	if (rosterGroupContainsEntry(group, oldID))
690	return true;
691	} else if (item instanceof org.eclipse.ecf.presence.roster.RosterEntry) {
692	org.eclipse.ecf.presence.roster.RosterEntry entry = (org.eclipse.ecf.presence.roster.RosterEntry) item;
693	XMPPID entryID = (XMPPID) entry.getUser().getID();
694	if (entryID.equals(oldID))
695	return true;
696	}
697	}
698	}
699	return false;
700	}
701
702	private AdditionalClient removeEntryFromRoster(XMPPID oldID,
703	org.eclipse.ecf.presence.roster.RosterEntry entry,
704	IPresence newPresence, IUser user) {
705	if (countClientsInRoster(oldID) > 1) {
706	// remove this client from roster
707	return new AdditionalClient(user);
708	} else {
709	// Last one, so we set resource to null and set presence to
710	// unavailable
711	oldID.setResourceName(null);
712	entry.setPresence(newPresence);
713	rosterManager.notifyRosterUpdate(entry);
714	return null;
715	}
716	}
717
718	private AdditionalClient updatePresenceForMatchingEntry(
719	org.eclipse.ecf.presence.roster.RosterEntry entry, XMPPID fromID,	618	org.eclipse.ecf.presence.roster.RosterEntry entry, XMPPID fromID,
720	IPresence newPresence) {	619	IPresence newPresence) {
721	final IUser user = entry.getUser();	620	final IUser user = entry.getUser();
722	XMPPID oldID = (XMPPID) user.getID();	621	XMPPID oldID = (XMPPID) user.getID();
723	if (newPresence.getType().equals(IPresence.Type.UNAVAILABLE)) {	622	// If the username/host part matches that means we either have to update
724	// This is an unavailable presence change	623	// the resource, or create a new client
725	if (oldID.equals(fromID))	624	if (oldID.equals(fromID)) {
726	return removeEntryFromRoster(oldID, entry, newPresence, user);	625	// set the new presence state
727	} else {	626	entry.setPresence(newPresence);
728	// This is some other presence change	627	// and notify with roster update
729	// If the username/host part matches that means we either have to	628	rosterManager.notifyRosterUpdate(entry);
730	// update	629	} else if (oldID.getUsernameAtHost().equals(fromID.getUsernameAtHost())) {
731	// the resource, or create a new client	630	if (oldID.getResourceName() == null) {
732	if (oldID.equals(fromID)) {	631	oldID.setResourceName(fromID.getResourceName());
733	// set the new presence state	632	// set the new presence state
734	entry.setPresence(newPresence);	633	entry.setPresence(newPresence);
735	// and notify with roster update	634	// and notify with roster update
736	rosterManager.notifyRosterUpdate(entry);	635	rosterManager.notifyRosterUpdate(entry);
737	} else if (oldID.getUsernameAtHost().equals(	636	} else if (fromID.getResourceName() != null && !newPresence.getType().equals(IPresence.Type.UNAVAILABLE)) {
738	fromID.getUsernameAtHost())) {	637	return new AdditionalClientRosterEntry(entry.getParent(), new User(fromID, user.getName()), newPresence);
739	if (oldID.getResourceName() == null) {
740	oldID.setResourceName(fromID.getResourceName());
741	// set the new presence state
742	entry.setPresence(newPresence);
743	// and notify with roster update
744	rosterManager.notifyRosterUpdate(entry);
745	} else
746	return new AdditionalClient(entry.getParent(), new User(
747	fromID, user.getName()), newPresence, true);
748	}	638	}
749	}	639	}
750	return null;	640	return null;
751	}	641	}
752		642
753	private AdditionalClient updatePresenceInGroup(IRosterGroup group,	643	private AdditionalClientRosterEntry[] updatePresenceInGroup(IRosterGroup group,
754	XMPPID fromID, IPresence newPresence) {	644	XMPPID fromID, IPresence newPresence) {
		645	List results = new ArrayList();
755	final Collection groupEntries = group.getEntries();	646	final Collection groupEntries = group.getEntries();
756	AdditionalClient newEntry = null;
757	synchronized (groupEntries) {	647	synchronized (groupEntries) {
758	for (final Iterator i = group.getEntries().iterator(); i.hasNext();) {	648	for (final Iterator i = group.getEntries().iterator(); i.hasNext();) {
759	AdditionalClient newClient = updatePresenceForMatchingEntry(	649	AdditionalClientRosterEntry newEntry = updatePresenceForMatchingEntry(
760	(org.eclipse.ecf.presence.roster.RosterEntry) i.next(),	650	(org.eclipse.ecf.presence.roster.RosterEntry) i.next(),
761	fromID, newPresence);	651	fromID, newPresence);
762	if (newClient != null)	652	if (newEntry != null)
763	newEntry = newClient;	653	results.add(newEntry);
764	}	654	}
765	}	655	}
766	return newEntry;	656	return (AdditionalClientRosterEntry[]) results.toArray(new AdditionalClientRosterEntry[] {});
767	}	657	}
768		658
769	protected void handleRoster(Roster roster) {	659	protected void handleRoster(Roster roster) {

Added Link Here

(-)src/org/eclipse/ecf/internal/provider/xmpp/search/XMPPResultItem.java (+60 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
3	* program and the accompanying materials are made available under the terms of
4	* the Eclipse Public License v1.0 which accompanies this distribution, and is
5	* available at http://www.eclipse.org/legal/epl-v10.html
6	*
7	* Contributors: Marcelo Mayworm - initial API and implementation
8	*
9	******************************************************************************/
10	package org.eclipse.ecf.internal.provider.xmpp.search;
11
12	import org.eclipse.ecf.core.user.IUser;
13	import org.eclipse.ecf.presence.search.IResult;
14
15	/**
16	* Implement a specific result for XMPP
17	*@since 3.0
18	*/
19	public class XMPPResultItem implements IResult {
20
21	/** contain a IUser */
22	protected IUser user;
23
24	/**
25	* Create a XMPP result with a IUser
26	* @param user IUser
27	*/
28	public XMPPResultItem(IUser user) {
29	this.user = user;
30	}
31
32	/*
33	* (non-Javadoc)
34	* @see org.eclipse.ecf.presence.search.IResult#getUser()
35	*/
36	public IUser getUser() {
37	return user;
38	}
39
40	/**
41	* Verify if there is the same IUser. Compare using ID
42	*/
43	public boolean equals(Object o) {
44	if(o instanceof XMPPResultItem)
45	return ((XMPPResultItem) o).getUser().getID().toString().equals(user.getID().toString());
46	else
47	return false;
48	}
49
50	public int hashCode() {
51	return (user.getID().toString() != null ? user.getID().toString()
52	.hashCode() : 0);
53	}
54
55	public Object getAdapter(Class adapter) {
56	// TODO Auto-generated method stub
57	return null;
58	}
59
60	}

Lines 20-34 Link Here

(-).project (-6 lines)
20	<arguments>	20	<arguments>
21	</arguments>	21	</arguments>
22	</buildCommand>	22	</buildCommand>
23	<buildCommand>
24	<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
25	<arguments>
26	</arguments>
27	</buildCommand>
28	</buildSpec>	23	</buildSpec>
29	<natures>	24	<natures>
30	<nature>org.eclipse.pde.PluginNature</nature>	25	<nature>org.eclipse.pde.PluginNature</nature>
31	<nature>org.eclipse.jdt.core.javanature</nature>	26	<nature>org.eclipse.jdt.core.javanature</nature>
32	<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
33	</natures>	27	</natures>
34	</projectDescription>	28	</projectDescription>

Added Link Here

(-)src/org/ecllpse/ecf/tests/provider/xmpp/search/XMPPSearchTest.java (+248 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
3	* program and the accompanying materials are made available under the terms of
4	* the Eclipse Public License v1.0 which accompanies this distribution, and is
5	* available at http://www.eclipse.org/legal/epl-v10.html
6	*
7	* Contributors: Marcelo Mayworm - initial API and implementation
8	*
9	******************************************************************************/
10	package org.ecllpse.ecf.tests.provider.xmpp.search;
11
12	import java.util.Iterator;
13
14	import org.eclipse.ecf.core.ContainerConnectException;
15	import org.eclipse.ecf.core.IContainer;
16	import org.eclipse.ecf.core.identity.ID;
17	import org.eclipse.ecf.presence.search.AbstractUserSearchManager;
18	import org.eclipse.ecf.presence.search.ICriteria;
19	import org.eclipse.ecf.presence.search.ICriterion;
20	import org.eclipse.ecf.presence.search.IResult;
21	import org.eclipse.ecf.presence.search.IResultList;
22	import org.eclipse.ecf.presence.search.ISearch;
23	import org.eclipse.ecf.presence.search.IRestriction;
24	import org.eclipse.ecf.presence.search.IUserSearchCompleteEvent;
25	import org.eclipse.ecf.presence.search.IUserSearchEvent;
26	import org.eclipse.ecf.presence.search.IUserSearchListener;
27	import org.eclipse.ecf.presence.search.IUserSearchManager;
28	import org.eclipse.ecf.tests.presence.AbstractSearchTest;
29	import org.ecllpse.ecf.tests.provider.xmpp.XMPP;
30
31	/**
32	*
33	* @since 3.0
34	*/
35	public class XMPPSearchTest extends AbstractSearchTest {
36
37	private static final String USERNAME = "Username";
38	private static final String EMAIL = "Email";
39	private static final String NAME = "Name";
40	IContainer client;
41	IUserSearchManager searchManager;
42	ISearch searchResult;
43
44	protected String getClientContainerName() {
45	return XMPP.CONTAINER_NAME;
46	}
47
48	public void testRetrieveBuddiesAsync() throws Exception {
49	assertNotNull(searchManager);
50
51	IRestriction selection = searchManager.createSelection();
52
53	assertNotNull(selection);
54
55	// fields to consider on XMPP server side search
56	// search field for XMPP, criterion to match the search
57	ICriterion name = selection.eq(NAME, "Marcelo*");
58	ICriterion email = selection.eq(EMAIL, "zx*");
59	ICriterion username = selection.eq(USERNAME, "sl*");
60
61	// create a specific criteria
62	ICriteria criteria = searchManager.createCriteria();
63	assertNotNull(criteria);
64	criteria.add(name);
65	criteria.add(email);
66	criteria.add(username);
67
68	final IUserSearchEvent event = new IUserSearchEvent(){};
69
70	IUserSearchListener listenerCompleted = new IUserSearchListener(){
71	public void handleUserSearchEvent(IUserSearchEvent event) {
72	if(event instanceof IUserSearchCompleteEvent){
73	searchResult = ((IUserSearchCompleteEvent)event).getSearch();
74	}
75	}
76	};
77
78	((AbstractUserSearchManager) searchManager).addListener(listenerCompleted);
79
80	// call the non-block search
81	searchManager.search(criteria, ((AbstractUserSearchManager) searchManager).getUserSearchListner());
82
83	//async operation that fire an event to start a user search
84	Thread localThread = new Thread(new Runnable() {
85	public void run() {
86	((AbstractUserSearchManager) searchManager).fireUserSearchEvent(event);
87	}
88	});
89	assertNull(searchResult);
90	localThread.setDaemon(true);
91	localThread.start();
92
93	Thread.sleep(5000);
94
95	//put the completion result on the search handle
96	assertNotNull(searchResult);
97
98	// check if there is at least one result
99	assertTrue(0 != searchResult.getResultList().geResults().size());
100	}
101
102	/**
103	* Try to locate buddies on the XMPP server in a call block way
104	*
105	* @throws ContainerConnectException
106	*/
107	public void testRetrieveBuddiesAllFieldsSync()
108	throws ContainerConnectException {
109
110	try {
111	assertNotNull(searchManager);
112
113	IRestriction selection = searchManager.createSelection();
114	assertNotNull(selection);
115
116	// fields to consider on XMPP server side search
117	// search field for XMPP, criterion to match the search
118	ICriterion name = selection.eq(NAME, "Marcelo*");
119	ICriterion email = selection.eq(EMAIL, "zx*");
120	ICriterion username = selection.eq(USERNAME, "sl*");
121
122	// create a specific criteria
123	ICriteria criteria = searchManager.createCriteria();
124	assertNotNull(criteria);
125	criteria.add(name);
126	criteria.add(email);
127	criteria.add(username);
128
129	// call the block search
130	ISearch search = searchManager.search(criteria);
131
132	// the collection of IResult
133	IResultList resultList = search.getResultList();
134
135	// check if there is at least one result
136	assertTrue(0 != resultList.geResults().size());
137
138	Iterator it = resultList.geResults().iterator();
139	while (it.hasNext()) {
140	IResult type = (IResult) it.next();
141	System.out.println(type.getUser().getName() + " : "
142	+ type.getUser().getID());
143
144	}
145	} catch (Exception e) {
146	e.printStackTrace();
147	}
148
149	}
150
151	/**
152	* Try to locate buddies on the XMPP server in a call block way
153	*
154	* @throws ContainerConnectException
155	*/
156	public void testRetrieveBuddiesEmailFieldSync()
157	throws Exception {
158
159	assertNotNull(searchManager);
160
161	IRestriction selection = searchManager.createSelection();
162	assertNotNull(selection);
163
164	// search field for XMPP, criterion to match the search
165	// fields to consider on XMPP server side search
166	ICriterion email = selection.eq(EMAIL, "mayworm*");
167
168	// create a specific criteria
169	ICriteria criteria = searchManager.createCriteria();
170	assertNotNull(criteria);
171	criteria.add(email);
172
173	// call the block search
174	ISearch search = searchManager.search(criteria);
175
176	// the collection of IResult
177	IResultList resultList = search.getResultList();
178
179	// check if there is at least one result
180	assertTrue(1 == resultList.geResults().size());
181
182	}
183
184	/**
185	* Try to locate buddies on the XMPP server in a call block way
186	*
187	* @throws ContainerConnectException
188	*/
189	public void testRetrieveBuddiesNameFieldSync()
190	throws Exception {
191
192	assertNotNull(searchManager);
193
194	IRestriction selection = searchManager.createSelection();
195	assertNotNull(selection);
196
197	// fields to consider on XMPP server side search
198	// search field for XMPP, criterion to match the search
199	ICriterion name = selection.eq(NAME, "marcelo*");
200
201	// create a specific criteria
202	ICriteria criteria = searchManager.createCriteria();
203	assertNotNull(criteria);
204	// criteria.add(searchCriterion);
205	criteria.add(name);
206
207	// call the block search
208	ISearch search = searchManager.search(criteria);
209
210	// the collection of IResult
211	IResultList resultList = search.getResultList();
212
213	// check if there is at least one result
214	assertTrue(1 == resultList.geResults().size());
215
216	}
217
218	protected void setUp() throws Exception {
219	super.setUp();
220	final int clientIndex = 0;
221	client = getClient(clientIndex);
222	assertNull(client.getConnectedID());
223	final ID serverConnectID = getServerConnectID(clientIndex);
224	assertNotNull(serverConnectID);
225
226	connectClient(client, serverConnectID, getConnectContext(clientIndex));
227	assertEquals(serverConnectID, client.getConnectedID());
228
229	searchManager = getPresenceAdapter(clientIndex).getUserSearchManager();
230
231	}
232
233	protected void tearDown() throws Exception {
234	super.tearDown();
235	client.disconnect();
236	}
237
238	public void testUserProperties() throws ContainerConnectException {
239	assertNotNull(searchManager);
240	String userProperties[] = searchManager.getUserPropertiesFields();
241
242	// check if there is at least one result
243	assertTrue(0 != userProperties.length);
244
245	}
246
247
248	}

Lines 40-45 Link Here

(-)src/org/eclipse/ecf/internal/presence/ui/messages.properties (+21 lines)
40	MultiRosterView_CHANGE_PASSWORD_EXCEPTION=changePassword	40	MultiRosterView_CHANGE_PASSWORD_EXCEPTION=changePassword
41	MultiRosterView_ENTER_CHATROOM_TOOLTIP_TEXT=Show chat rooms for all accounts	41	MultiRosterView_ENTER_CHATROOM_TOOLTIP_TEXT=Show chat rooms for all accounts
42	MultiRosterView_AddContact = &Add Contact	42	MultiRosterView_AddContact = &Add Contact
		43	MultiRosterView_SearchContact = &Search Contact
43		44
44	MessagesView_ClearChatLog = &Clear Chat Log	45	MessagesView_ClearChatLog = &Clear Chat Log
45	MessagesView_ClearChatLogDialogTitle = Clear Chat Log	46	MessagesView_ClearChatLogDialogTitle = Clear Chat Log
Lines 56-61 Link Here
56	AddContactDialog_Alias = Alias:	57	AddContactDialog_Alias = Alias:
57	AddContactDialog_Account = Account:	58	AddContactDialog_Account = Account:
58		59
		60	SearchContactDialog_DialogTitle = Search Contact
		61	SearchContactDialog = Search
		62	SearchContactDialog_InfoSearching = The following fields are available\nfor searching. Wildcard(*)\ncharacters are allowed as part the\nof query.
		63	SearchContactDialog_InfoSearchFields= Search Fields
		64	SearchContactDialog_InfoContactFields = Search Results
		65	SearchContactDialog_ButtonSearch = Search
		66	SearchContactDialog_ButtonStop = Stop
		67	SearchContactDialog_ButtonAddContact = Add Contact
		68	SearchContactDialog_ContactInfo=Contact Info
		69	SearchContactDialog_RunInBackground=Run in background
		70	SearchContactDialog_RunInBackGroundToolTip=Run long operations in the background where possible
		71	SearchContactDialog_TableResultColumnName=Name
		72	SearchContactDialog_TableResultColumnUsername=ID
		73	SearchContactDialog_TableSearchColumnField=Field
		74	SearchContactDialog_TableSearchColumnValue=Value For Search
		75	SearchContactDialog_AddContactMessage=Do you want to add the contact {0}?
		76	SearchContactDialog_SearchingMessage=Searching...
		77	SearchContactDialog_UserSearchJobName=Searching User...
		78
59	RosterWorkbenchAdapterFactory_Mode = Mode: {0}	79	RosterWorkbenchAdapterFactory_Mode = Mode: {0}
60	RosterWorkbenchAdapterFactory_Type = Type: {0}	80	RosterWorkbenchAdapterFactory_Type = Type: {0}
61	RosterWorkbenchAdapterFactory_Account = Account: {0}	81	RosterWorkbenchAdapterFactory_Account = Account: {0}
Lines 149-151 Link Here
149	ChatRoomPreferencePage_CHATROOM_SHOW_USER_PRESENCE_TEXT=&Show user entry and exit messages	169	ChatRoomPreferencePage_CHATROOM_SHOW_USER_PRESENCE_TEXT=&Show user entry and exit messages
150		170
151	ChatRoomPreferencePage_SCROLL_OUTPUT_ON_INPUT=Scroll &output to bottom on user input	171	ChatRoomPreferencePage_SCROLL_OUTPUT_ON_INPUT=Scroll &output to bottom on user input
		172	UserSearchLabelProvider_ContactsFound=\ contacts found

Added Link Here

(-)src/org/eclipse/ecf/presence/ui/UserSearchView.java (+183 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
3	* program and the accompanying materials are made available under the terms of
4	* the Eclipse Public License v1.0 which accompanies this distribution, and is
5	* available at http://www.eclipse.org/legal/epl-v10.html
6	*
7	* Contributors: Marcelo Mayworm - initial API and implementation
8	*
9	******************************************************************************/
10	package org.eclipse.ecf.presence.ui;
11
12	import java.util.ArrayList;
13	import java.util.List;
14	import org.eclipse.core.runtime.Assert;
15	import org.eclipse.ecf.core.util.ECFException;
16	import org.eclipse.ecf.internal.presence.ui.Activator;
17	import org.eclipse.ecf.internal.presence.ui.Messages;
18	import org.eclipse.ecf.presence.IPresenceContainerAdapter;
19	import org.eclipse.ecf.presence.roster.IRosterSubscriptionSender;
20	import org.eclipse.ecf.presence.search.IResult;
21	import org.eclipse.ecf.presence.search.IResultList;
22	import org.eclipse.ecf.ui.SharedImages;
23	import org.eclipse.jface.action.*;
24	import org.eclipse.jface.dialogs.MessageDialog;
25	import org.eclipse.jface.viewers.*;
26	import org.eclipse.osgi.util.NLS;
27	import org.eclipse.swt.SWT;
28	import org.eclipse.swt.widgets.*;
29	import org.eclipse.ui.part.PageBook;
30	import org.eclipse.ui.part.ViewPart;
31
32	/**
33	* View class for displaying multiple users that match a search in a tree viewer. This view part
34	* provides the ability to display multiple users in a single tree viewer. This class may be subclassed as
35	* desired to add or customize behavior.
36	*/
37	public class UserSearchView extends ViewPart {
38
39	public static final String VIEW_ID = "org.eclipse.ecf.presence.ui.UserSearchView"; //$NON-NLS-1$
40
41	protected static final int DEFAULT_EXPAND_LEVEL = 3;
42
43	protected TreeViewer treeViewer;
44
45	protected List users = new ArrayList();
46
47	private IAction addContactAction;
48
49	private MultiRosterAccount account;
50
51	private PageBook pageBook;
52
53	private Label helpMessageLabel;
54
55	/*
56	* (non-Javadoc)
57	*
58	* @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
59	*/
60	public void createPartControl(Composite parent) {
61	pageBook = new PageBook(parent, SWT.NONE);
62
63	createHelpMessage(pageBook);
64	setupTreeViewer(pageBook);
65
66	if (users.size() == 0)
67	pageBook.showPage(helpMessageLabel);
68	}
69
70	private void createHelpMessage(Composite parent) {
71	if (!parent.isDisposed()) {
72	helpMessageLabel = new Label(parent, SWT.TOP + SWT.LEFT + SWT.WRAP);
73	}
74	}
75
76	protected void setupTreeViewer(Composite parent) {
77	treeViewer = new TreeViewer(parent, SWT.BORDER \| SWT.SINGLE \| SWT.V_SCROLL);
78	getSite().setSelectionProvider(treeViewer);
79	treeViewer.setContentProvider(new UserSearchContentProvider());
80	treeViewer.setLabelProvider(new UserSearchLabelProvider());
81	makeActions();
82	hookContextMenu();
83
84	}
85
86	private void makeActions() {
87
88	addContactAction = new Action(Messages.MultiRosterView_AddContact, SharedImages.getImageDescriptor(SharedImages.IMG_ADD_BUDDY)) {
89	public void run() {
90	ITreeSelection selection = (ITreeSelection) treeViewer.getSelection();
91	IResult contact = (IResult) selection.getFirstElement();
92	if (MessageDialog.openConfirm(null, Messages.AddContactDialog_DialogTitle, NLS.bind(Messages.SearchContactDialog_AddContactMessage, contact.getUser().getName()))) {
93	IPresenceContainerAdapter ipca = account.getPresenceContainerAdapter();
94	IRosterSubscriptionSender sender = ipca.getRosterManager().getRosterSubscriptionSender();
95	try {
96	sender.sendRosterAdd(contact.getUser().getID().getName(), contact.getUser().getName(), null);
97	} catch (ECFException e) {
98	Activator.getDefault().getLog().log(e.getStatus());
99	}
100	}
101
102	}
103	};
104
105	}
106
107	private void hookContextMenu() {
108	MenuManager menuMgr = new MenuManager();
109	menuMgr.setRemoveAllWhenShown(true);
110	menuMgr.addMenuListener(new IMenuListener() {
111	public void menuAboutToShow(IMenuManager manager) {
112	fillContextMenu(manager);
113	}
114	});
115	Menu menu = menuMgr.createContextMenu(treeViewer.getControl());
116	treeViewer.getControl().setMenu(menu);
117	getSite().registerContextMenu(menuMgr, treeViewer);
118	}
119
120	private void fillContextMenu(IMenuManager manager) {
121	IStructuredSelection iss = (IStructuredSelection) treeViewer.getSelection();
122	Object element = iss.getFirstElement();
123	if (element instanceof IResult) {
124	manager.add(addContactAction);
125	}
126	}
127
128	/*
129	* (non-Javadoc)
130	*
131	* @see org.eclipse.ui.part.WorkbenchPart#dispose()
132	*/
133	public void dispose() {
134	treeViewer = null;
135	users.clear();
136	super.dispose();
137	}
138
139	/*
140	* (non-Javadoc)
141	*
142	* @see org.eclipse.ui.part.WorkbenchPart#setFocus()
143	*/
144	public void setFocus() {
145	treeViewer.getControl().setFocus();
146	}
147
148	/**
149	* Add the list of {@link IResult} that will be display on a tree
150	* @param list
151	* @return boolean
152	*/
153	public boolean addResult(IResultList list) {
154	users.clear();
155	users.add(list);
156	treeViewer.setInput(users);
157	pageBook.showPage(treeViewer.getControl());
158	treeViewer.expandToLevel(DEFAULT_EXPAND_LEVEL);
159	helpMessageLabel.setText("");
160	return true;
161	}
162
163	/**
164	* Add the MultiRosterAccount for add user contact
165	* @param account
166	* @return boolean
167	*/
168	public boolean addMultiRosterAccount(MultiRosterAccount multiRosterAccount) {
169	Assert.isNotNull(multiRosterAccount);
170	this.account = multiRosterAccount;
171	return true;
172	}
173
174	/**
175	* Show a message into the view before show the result in a tree view
176	* @param string
177	*/
178	public void showMessage(String message) {
179	helpMessageLabel.setText(message);
180	pageBook.showPage(helpMessageLabel);
181	}
182
183	}

Added Link Here

(-)src/org/eclipse/ecf/presence/search/IUserSearchCompleteEvent.java (+23 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
3	* program and the accompanying materials are made available under the terms of
4	* the Eclipse Public License v1.0 which accompanies this distribution, and is
5	* available at http://www.eclipse.org/legal/epl-v10.html
6	*
7	* Contributors: Marcelo Mayworm - initial API and implementation
8	*
9	******************************************************************************/
10	package org.eclipse.ecf.presence.search;
11
12	/**
13	* This event indicate that a user search was completed
14	*@since 3.0
15	*/
16	public interface IUserSearchCompleteEvent extends IUserSearchEvent {
17
18	/**
19	* Provide the result for a non-blocking search
20	* @return ISearch
21	*/
22	public ISearch getSearch();
23	}

Added Link Here

(-)src/org/eclipse/ecf/presence/search/ResultList.java (+103 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
3	* program and the accompanying materials are made available under the terms of
4	* the Eclipse Public License v1.0 which accompanies this distribution, and is
5	* available at http://www.eclipse.org/legal/epl-v10.html
6	*
7	* Contributors: Marcelo Mayworm - initial API and implementation
8	*
9	******************************************************************************/
10	package org.eclipse.ecf.presence.search;
11
12	import java.util.*;
13	import org.eclipse.core.runtime.IAdapterManager;
14	import org.eclipse.ecf.internal.presence.PresencePlugin;
15
16	/**
17	* This Class implements {@link IResultList}. Subclasses may be created as
18	* appropriate.
19	* @since 3.0
20	*/
21	public class ResultList implements IResultList {
22
23	protected Set results;
24
25	/**
26	* Create a new synchronized result list from a existing one
27	* @param existingResults
28	*/
29	public ResultList(Collection /* <IResult> */existingResults) {
30	results = Collections.synchronizedSet(new HashSet());
31	if (existingResults != null)
32	addAll(existingResults);
33	}
34
35	/**
36	* Create a new synchronized result list from a existing one
37	*
38	*/
39	public ResultList() {
40	results = Collections.synchronizedSet(new HashSet());
41	}
42
43	/**
44	* Add an item for the result list
45	* @param item
46	* @return boolean
47	*/
48	public boolean add(IResult item) {
49	if (item == null)
50	return false;
51	if (results.add(item))
52	return true;
53	return false;
54	}
55
56	/**
57	* Add the list for the current result list
58	* @param existingResults
59	*/
60	public void addAll(Collection /* <IResult> */existingResults) {
61	if (existingResults == null)
62	return;
63	synchronized (results) {
64	for (Iterator i = existingResults.iterator(); i.hasNext();) {
65	add((IResult) i.next());
66	}
67	}
68	}
69
70	/*
71	* (non-Javadoc)
72	*
73	* @see org.eclipse.ecf.ui.presence.search.IResultList#getEntries()
74	*/
75	public Collection geResults() {
76	return results;
77	}
78
79	public boolean remove(IResult item) {
80	return results.remove(item);
81	}
82
83	/*
84	* (non-Javadoc)
85	*
86	* @see org.eclipse.ecf.ui.presence.search.IResultList#getResult
87	*/
88	public IResult getResult(String field, String value) {
89	// TODO
90	return null;
91	}
92
93	public Object getAdapter(Class adapter) {
94	if (adapter.isInstance(this)) {
95	return this;
96	}
97	IAdapterManager adapterManager = PresencePlugin.getDefault().getAdapterManager();
98	if (adapterManager == null)
99	return null;
100	return adapterManager.loadAdapter(this, adapter.getName());
101	}
102
103	}

Added Link Here

(-)src/org/eclipse/ecf/presence/search/LogicalCriterion.java (+49 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
3	* program and the accompanying materials are made available under the terms of
4	* the Eclipse Public License v1.0 which accompanies this distribution, and is
5	* available at http://www.eclipse.org/legal/epl-v10.html
6	*
7	* Contributors: Marcelo Mayworm - initial API and implementation
8	*
9	******************************************************************************/
10	package org.eclipse.ecf.presence.search;
11
12	/**
13	* Base class implementation of {@link ICriterion} for logical criterion.
14	* Subclasses may be created as appropriate. It is just a simple
15	* implementation that can be considered for some provider or even used
16	* as base for some implementation.
17	* @since 3.0
18	*/
19	public class LogicalCriterion implements ICriterion {
20
21	final ICriterion left;
22	final ICriterion right;
23	final String operator;
24
25	/**
26	* Creates a logic operation for compose a {@link ICrteria}
27	* @param left Criterion on the left side of the expression
28	* @param right Criterion on the right side of the expression
29	* @param operator Operator considered on the logical. Ex: And
30	*/
31	public LogicalCriterion(ICriterion left, ICriterion right, String operator) {
32	this.left = left;
33	this.right = right;
34	this.operator = operator;
35	}
36
37	public String toExpression() {
38	return left.toExpression() + ' ' + operator + ' ' + right.toExpression();
39	}
40
41	public String toString() {
42	StringBuffer sb = new StringBuffer("LogicalCriterion["); //$NON-NLS-1$
43	sb.append("left=").append(left).append(";"); //$NON-NLS-1$ //$NON-NLS-2$
44	sb.append("right=").append(right).append(";"); //$NON-NLS-1$ //$NON-NLS-2$
45	sb.append("operator=").append(operator).append("]"); //$NON-NLS-1$ //$NON-NLS-2$
46	return sb.toString();
47	}
48
49	}

Added Link Here

(-)src/org/eclipse/ecf/presence/search/UserSearchCompleteEvent.java (+28 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
3	* program and the accompanying materials are made available under the terms of
4	* the Eclipse Public License v1.0 which accompanies this distribution, and is
5	* available at http://www.eclipse.org/legal/epl-v10.html
6	*
7	* Contributors: Marcelo Mayworm - initial API and implementation
8	*
9	******************************************************************************/
10	package org.eclipse.ecf.presence.search;
11
12	/**
13	*
14	* @since 3.0
15	*/
16	public class UserSearchCompleteEvent implements IUserSearchCompleteEvent {
17
18	private ISearch search;
19
20	public UserSearchCompleteEvent(ISearch search) {
21	this.search = search;
22	}
23
24	public ISearch getSearch() {
25	return search;
26	}
27
28	}

Added Link Here

(-)src/org/eclipse/ecf/presence/search/SimpleCriterion.java (+83 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
3	* program and the accompanying materials are made available under the terms of
4	* the Eclipse Public License v1.0 which accompanies this distribution, and is
5	* available at http://www.eclipse.org/legal/epl-v10.html
6	*
7	* Contributors: Marcelo Mayworm - initial API and implementation
8	*
9	******************************************************************************/
10	package org.eclipse.ecf.presence.search;
11
12	/**
13	*
14	* Base class implementation of {@link ICriterion} for simple comparisons. Subclasses may be created as
15	* appropriate.
16	* @since 3.0
17	*/
18	public class SimpleCriterion implements ICriterion {
19
20	protected final String field;
21	protected final String value;
22	protected final String operator;
23	protected final boolean ignoreCase;
24
25	/**
26	* Constructor for a instance of {@link ICriterion}
27	* @param field Name of the field
28	* @param value Value that match the search
29	* @param operator Operator opportune for the search
30	* @param ignoreCase Consider case or not
31	*/
32	public SimpleCriterion(String field, String value, String operator, boolean ignoreCase) {
33	this.field = field;
34	this.value = value;
35	this.operator = operator;
36	this.ignoreCase = ignoreCase;
37	}
38
39	/**
40	* Constructor for a instance of {@link ICriterion}. This is
41	* ignore case
42	* @param field Name of the field
43	* @param value Value that match the search
44	* @param operator Operator opportune for the search
45	*/
46	public SimpleCriterion(String field, String value, String operator) {
47	this.field = field;
48	this.value = value;
49	this.operator = operator;
50	this.ignoreCase = false;
51	}
52
53	/*
54	* (non-Javadoc)
55	* @see org.eclipse.ecf.presence.search.ICriterion#toExpression()
56	*/
57	public String toExpression() {
58	return field + ' ' + operator + ' ' + value;
59	}
60
61	public String toString() {
62	StringBuffer sb = new StringBuffer("SimpleCriterion["); //$NON-NLS-1$
63	sb.append("field=").append(field).append(";"); //$NON-NLS-1$ //$NON-NLS-2$
64	sb.append("value=").append(value).append(";"); //$NON-NLS-1$ //$NON-NLS-2$
65	sb.append("operator=").append(operator).append(";"); //$NON-NLS-1$ //$NON-NLS-2$
66	sb.append("ignoreCase=").append(ignoreCase).append("]"); //$NON-NLS-1$ //$NON-NLS-2$
67	return sb.toString();
68	}
69
70	public boolean equals(Object o) {
71	if (this == o) {
72	return true;
73	}
74	if (o instanceof String) {
75	return o.equals(field);
76	}
77	return false;
78	}
79
80	public int hashCode() {
81	return (field != null ? field.hashCode() : 0);
82	}
83	}

Added Link Here

(-)src/org/eclipse/ecf/presence/search/AbstractUserSearchManager.java (+86 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
3	* program and the accompanying materials are made available under the terms of
4	* the Eclipse Public License v1.0 which accompanies this distribution, and is
5	* available at http://www.eclipse.org/legal/epl-v10.html
6	*
7	* Contributors: Marcelo Mayworm - initial API and implementation
8	*
9	******************************************************************************/
10	package org.eclipse.ecf.presence.search;
11
12	import java.util.*;
13
14	/**
15	* Abstract implementation of IUserSearchManager. Provides implementations of listener
16	* methods that subsclasses may use to avoid having to implement them
17	* themselves. This class may be subclassed as needed.
18	* @since 3.0
19	*/
20	public abstract class AbstractUserSearchManager implements IUserSearchManager {
21
22	private final List userSearchListeners = new ArrayList(5);
23	protected ICriteria criteria;
24
25	/**
26	* Add the listener to be notify by events
27	* @param listener
28	*/
29	public void addListener(IUserSearchListener l) {
30	synchronized (userSearchListeners) {
31	userSearchListeners.add(l);
32	}
33	}
34
35	public void removeListener(IUserSearchListener l) {
36	synchronized (userSearchListeners) {
37	userSearchListeners.remove(l);
38	}
39	}
40
41	/**
42	* Fires a user search event
43	*
44	* @param event
45	*/
46	public void fireUserSearchEvent(IUserSearchEvent event) {
47	List toNotify = null;
48	// Copy array
49	synchronized (userSearchListeners) {
50	toNotify = new ArrayList(userSearchListeners);
51	}
52	// Notify all in toNotify
53	for (Iterator i = toNotify.iterator(); i.hasNext();) {
54	IUserSearchListener l = (IUserSearchListener) i.next();
55	l.handleUserSearchEvent(event);
56	}
57	}
58
59	/**
60	* Returns a default implementation for IUserSearchListner
61	* @return IUserSearchListener
62	*/
63	public IUserSearchListener getUserSearchListner() {
64	return new UserListener();
65	}
66
67	public class UserListener implements IUserSearchListener {
68
69	public void handleUserSearchEvent(IUserSearchEvent event) {
70	try {
71	if (event instanceof IUserSearchCompleteEvent) {
72	//ISearch searchResult = ((IUserSearchCompleteEvent) event).getSearch();
73	} else if (event instanceof IUserSearchEvent) {
74	ISearch searchResult = search(criteria);
75	fireUserSearchEvent(new UserSearchCompleteEvent(searchResult));
76	}
77
78	} catch (UserSearchException e) {
79	e.printStackTrace();
80	}
81
82	}
83
84	}
85
86	}

Added Link Here

(-)src/org/eclipse/ecf/tests/presence/AbstractSearchTest.java (+23 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Marcelo Mayworm. All rights reserved. This
3	* program and the accompanying materials are made available under the terms of
4	* the Eclipse Public License v1.0 which accompanies this distribution, and is
5	* available at http://www.eclipse.org/legal/epl-v10.html
6	*
7	* Contributors: Marcelo Mayworm - initial API and implementation
8	*
9	******************************************************************************/
10	package org.eclipse.ecf.tests.presence;
11
12
13	public abstract class AbstractSearchTest extends AbstractPresenceTestCase {
14
15	public static final int CLIENT_COUNT = 1;
16	public static final int WAITTIME = 3000;
17
18	protected void setUp() throws Exception {
19	setClientCount(CLIENT_COUNT);
20	clients = createClients();
21	}
22
23	}