Changeset 24099

Timestamp:

06/29/2008 05:04:01 PM (5 months ago)

Author:

evands

Message:

Refs #8742

• Added -[AIContactController knownMetaContactForGroupingUIDs:forServices:], which allows prediction of what metacontact, if any, will be used by -[AIContactController groupUIDs:forServices:].
  
• Replaced -[AIContactController groupUIDs:forServices:] with -[AIContactController groupUIDs:forServices:usingMetaContactHint:]. The new metaContactHint argument allows the caller to suggest a metacontact to be used if a new one would otherwise be created.
  

Files:

• trunk/Frameworks/Adium Framework/Source/AIContactControllerProtocol.h (modified) (1 diff)
• trunk/Source/AIContactController.m (modified) (6 diffs)

trunk/Frameworks/Adium Framework/Source/AIContactControllerProtocol.h

@@ -88 +88 @@
-- (AIListBookmark *)bookmarkForChat:(AIChat *)inChat;
-
-
+
+
+
+
-- (AIMetaContact *)groupListContacts:(NSArray *)contactsToGroupArray;
-- (void)removeAllListObjectsMatching:(AIListObject *)listObject fromMetaContact:(AIMetaContact *)metaContact;

trunk/Source/AIContactController.m

@@ -101 +101 @@
-
-//MetaContacts
-- (AIMetaContact *)metaContactWithObjectID:(NSNumber *)inObjectID;
-- (BOOL)_restoreContactsToMetaContact:(AIMetaContact *)metaContact;
-- (void)_restoreContactsToMetaContact:(AIMetaContact *)metaContact fromContainedContactsArray:(NSArray *)containedContactsArray;
@@ -680 +679 @@
-                 * existed before this call to metaContactWithObjectID:
-                 */
-
-
-
-
-
-
-
+
+
-                
-                /* As with contactWithService:account:UID, update all attributes so observers are initially informed of
@@ -696 +690 @@
-        }
-        
-(metaContact)
+metaContact
-}
-
@@ -951 +945 @@
-}
-
+/*!
+ * @brief Determine the existing metacontact into which a grouping of UIDs and services would be placed
+ *
+ * @param UIDsArray NSArray of UIDs
+ * @param servicesArray NSArray of serviceIDs corresponding to entries in UIDsArray
+ * 
+ * @result Either the existing AIMetaContact -[self groupUIDs:forServices:usingMetaContactHint:] would return if passed a nil metaContactHint,
+ *         or nil (if no existing metacontact would be used).
+ */
+- (AIMetaContact *)knownMetaContactForGroupingUIDs:(NSArray *)UIDsArray forServices:(NSArray *)servicesArray
+{
+        AIMetaContact   *metaContact = nil;
+        int                             count = [UIDsArray count];
+        int                             i;
+        
+        //Build an array of all contacts matching this description (multiple accounts on the same service listing
+        //the same UID mean that we can have multiple AIListContact objects with a UID/service combination)
+        for (i = 0; i < count; i++) {
+                if ((metaContact = [contactToMetaContactLookupDict objectForKey:[AIListObject internalObjectIDForServiceID:[servicesArray objectAtIndex:i]
+                                                                                                                                                                                                                           UID:[UIDsArray objectAtIndex:i]]])) {
+                        break;
+                }
+        }
+        
+        return metaContact;
+}
-
-/*!
@@ -963 +983 @@
- * @param UIDsArray NSArray of UIDs
- * @param servicesArray NSArray of serviceIDs corresponding to entries in UIDsArray
+ * @param metaContactHint If passed, an AIMetaContact to use for the grouping if an existing one isn't found. If nil, a new metacontact will be craeted in that case.
- */
-
+ usingMetaContactHint:(AIMetaContact *)metaContactHint
-{
-        NSMutableSet    *internalObjectIDs = [[NSMutableSet alloc] init];
@@ -989 +1010 @@
-        
-        if ([internalObjectIDs count] > 1) {
-.
-
+ and weren't supplied a hint
+ && !(metaContact = metaContactHint)
-                        AILogWithSignature(@"New metacontact to group %@ on %@", UIDsArray, servicesArray);
-                        metaContact = [self metaContactWithObjectID:nil];