r6912 - in dumbhippo/trunk/server/src/com/dumbhippo: live server server/dm server/impl

[commits mugshot org]

Author: hp
Date: 2007-11-14 14:21:58 -0600 (Wed, 14 Nov 2007)
New Revision: 6912

Modified:
   dumbhippo/trunk/server/src/com/dumbhippo/live/LiveState.java
   dumbhippo/trunk/server/src/com/dumbhippo/server/IdentitySpider.java
   dumbhippo/trunk/server/src/com/dumbhippo/server/dm/UserDMO.java
   dumbhippo/trunk/server/src/com/dumbhippo/server/impl/IdentitySpiderBean.java
Log:
clarify that computeContacts only returns User contacts

Modified: dumbhippo/trunk/server/src/com/dumbhippo/live/LiveState.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/live/LiveState.java	2007-11-14 20:10:29 UTC (rev 6911)
+++ dumbhippo/trunk/server/src/com/dumbhippo/live/LiveState.java	2007-11-14 20:21:58 UTC (rev 6912)
@@ -367,7 +367,7 @@
 					public LiveContacts create(Guid guid) {
 						LiveContacts liveContacts = new LiveContacts(guid);
 						IdentitySpider identitySpider = EJBUtil.defaultLookup(IdentitySpider.class);
-						liveContacts.setContacts(identitySpider.computeContacts(guid));
+						liveContacts.setContacts(identitySpider.computeUserContacts(guid));
 						
 						return liveContacts;
 					}

Modified: dumbhippo/trunk/server/src/com/dumbhippo/server/IdentitySpider.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/server/IdentitySpider.java	2007-11-14 20:10:29 UTC (rev 6911)
+++ dumbhippo/trunk/server/src/com/dumbhippo/server/IdentitySpider.java	2007-11-14 20:21:58 UTC (rev 6912)
@@ -242,12 +242,14 @@
 	/**
 	 * Compute the set of users that this user has listed as friends; this
 	 * function should not be used directly; it is an internal implementation
-	 * detail of the contact cache; use the functions below instead. 
+	 * detail of the contact cache; use the functions below instead.
+	 * Does not return contacts that are "just a resource" (that don't correspond to 
+	 * an account) 
 	 * 
 	 * @param userId GUID of the user
 	 * @return guids of contacts
 	 */
-	public Set<Guid> computeContacts(Guid userId);
+	public Set<Guid> computeUserContacts(Guid userId);
 	
 	/**
 	 * Compute the set of users that have listed this user as a friend; this

Modified: dumbhippo/trunk/server/src/com/dumbhippo/server/dm/UserDMO.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/server/dm/UserDMO.java	2007-11-14 20:10:29 UTC (rev 6911)
+++ dumbhippo/trunk/server/src/com/dumbhippo/server/dm/UserDMO.java	2007-11-14 20:21:58 UTC (rev 6912)
@@ -129,7 +129,7 @@
 	public Set<UserDMO> getContacts() {
 		Set<UserDMO> result = new HashSet<UserDMO>();
 		
-		for (Guid guid : identitySpider.computeContacts(user.getGuid()))
+		for (Guid guid : identitySpider.computeUserContacts(user.getGuid()))
 			result.add(session.findUnchecked(UserDMO.class, guid));
 		
 		return result;

Modified: dumbhippo/trunk/server/src/com/dumbhippo/server/impl/IdentitySpiderBean.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/server/impl/IdentitySpiderBean.java	2007-11-14 20:10:29 UTC (rev 6911)
+++ dumbhippo/trunk/server/src/com/dumbhippo/server/impl/IdentitySpiderBean.java	2007-11-14 20:21:58 UTC (rev 6912)
@@ -677,7 +677,7 @@
 		}
 	}
 
-	public Set<Guid> computeContacts(Guid userId) {
+	public Set<Guid> computeUserContacts(Guid userId) {
 		User user = em.find(User.class, userId.toString());
 		
 		Query q = em.createQuery("SELECT ac.owner.id " +