Changeset 25625

Timestamp:

11/24/2008 10:22:05 PM (2 months ago)

Author:

catfish_man

Message:

More changes in preparation for multiple group support. containingObject is now not recommended. Use the groups and metaContact/parentContact properties instead

Files:

• trunk/Frameworks/Adium Framework/Source/AIContactHidingController.m (modified) (1 diff)
• trunk/Frameworks/Adium Framework/Source/AIContactObserverManager.m (modified) (1 diff)
• trunk/Frameworks/Adium Framework/Source/AIListContact.h (modified) (2 diffs)
• trunk/Frameworks/Adium Framework/Source/AIListContact.m (modified) (7 diffs)
• trunk/Frameworks/Adium Framework/Source/AIListGroup.m (modified) (1 diff)
• trunk/Frameworks/Adium Framework/Source/AIListObject.h (modified) (1 diff)
• trunk/Frameworks/Adium Framework/Source/AIListObject.m (modified) (2 diffs)
• trunk/Frameworks/Adium Framework/Source/AIMetaContact.m (modified) (4 diffs)
• trunk/Frameworks/Adium Framework/Source/AIUserIcons.m (modified) (3 diffs)
• trunk/Plugins/Dual Window Interface/AIAccountSelectionView.m (modified) (1 diff)
• trunk/Plugins/Dual Window Interface/AIMessageViewController.m (modified) (3 diffs)
• trunk/Source/AIChatController.m (modified) (1 diff)
• trunk/Source/AIContactController.m (modified) (6 diffs)

trunk/Frameworks/Adium Framework/Source/AIContactHidingController.m

@@ -139 +139 @@
-        
-        //we can cast to AIListContact here since groups and metas were handled up above
-
-
+
+
+
+
+
+
+
+
+
-        
-        if (!showIdleContacts && [listObject valueForProperty:@"IdleSince"])

trunk/Frameworks/Adium Framework/Source/AIContactObserverManager.m

@@ -281 +281 @@
-                if (attributes) [self listObjectAttributesChanged:listObject modifiedKeys:attributes];
-                
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                [pool release];
-        }

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

@@ -20 +20 @@
-#define KEY_AB_UNIQUE_ID                @"AB Unique ID"
-
-
+, AIMetaContact
-
-@interface AIListContact : AIListObject {
-        AIAccount       *account;
+        AIMetaContact *metaContact;
-        NSString                *remoteGroupName;
-        NSString                *internalUniqueObjectID;
@@ -37 +38 @@
-- (void)restoreGrouping;
-
-Group *parentGroup;
-ListContact *parent
+Contact *parentContact; //This needs renaming. It's the 'topmost' contact, either self or meta
+MetaContact *meta
-
-@property (readonly, nonatomic) NSString *ownDisplayName;

trunk/Frameworks/Adium Framework/Source/AIListContact.m

@@ -127 +127 @@
-                [adium.contactController contactRemoteGroupingChanged:self];
-                
-parentContact != self
-(AIMetaContact *)self.parent
+metaContact
+self.meta
-                }
-        }
@@ -158 +158 @@
-- (NSString *)displayName
-{
-ListContact  *parentContact = self.parent
-
-parentContact == self ? super.displayName : parentContact
+MetaContact  *meta = self.meta
+
+meta ? meta.displayName : super
-
-        //If a display name was found, return it; otherwise, return the formattedUID  
@@ -249 +249 @@
-- (NSString *)phoneticName
-{
-ListContact  *parentContact = self.parent
+MetaContact *meta = self.meta
-        NSString                *phoneticName;
-
-
-
-
+
-        
-        //If a display name was found, return it; otherwise, return the formattedUID
-    
+       
-}
-
@@ -570 +568 @@
-
-#pragma mark Parents
-/*!
- * @brief This object's parent AIListGroup
- *
- * @result An AIListGroup which contains this object or the object containing this object, or nil if it is not in an AIListGroup.
- */
-- (AIListGroup *)parentGroup
-{
-        AIListObject<AIContainingObject>        *parentGroup = self.parentContact.containingObject;
-
-        if (parentGroup && [parentGroup isKindOfClass:[AIListGroup class]]) {
-                return (AIListGroup *)parentGroup;
-        } else {
-                return nil;
-        }
-}
-
-/*!
@@ -594 +577 @@
- * @result Either this contact or some more-encompassing contact which ultimately contains it.
- */
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-- (BOOL)containsObject:(AIListObject*)object
@@ -610 +590 @@
-}
-
+- (NSSet *)groups {
+        //if we're not in a meta, we should be in at least one group
+        if (!self.metaContact)
+                return containingObjects;
+        return [NSSet set];
+}
+
+- (void)setContainingObject:(AIListObject <AIContainingObject> *)inGroup
+{
+        if (!inGroup || [inGroup isKindOfClass:[AIMetaContact class]])
+                metaContact = (AIMetaContact *)inGroup;
+        [super setContainingObject:inGroup];
+}
+
-/*!
- * @brief Can this object be part of a metacontact?
@@ -616 +610 @@
-{
-        return YES;
+}
+
+- (AIMetaContact *)metaContact
+{
+        if (metaContact)
+                return metaContact;
+        return nil;
-}
-

trunk/Frameworks/Adium Framework/Source/AIListGroup.m

@@ -200 +200 @@
-        if ([self containsObject:inObject]) {           
-                //Remove the object
-inObject.containingObject == self
-[inObject setContainingObject:nil]
+[inObject.groups containsObject:self]
+inObject.containingObject = nil
-                [_containedObjects removeObject:inObject];
-

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

@@ -116 +116 @@
-//Grouping
-@property (readonly, nonatomic) AIListObject <AIContainingObject> *containingObject;
+@property (readonly, nonatomic) NSSet *groups;
-
-//Display

trunk/Frameworks/Adium Framework/Source/AIListObject.m

@@ -202 +202 @@
-//Grouping / Ownership -------------------------------------------------------------------------------------------------
-#pragma mark Grouping / Ownership
+
+- (NSSet *)groups
+{
+        return [NSSet set];
+}
+
-/*!
- * @brief Containing object of this object
@@ -220 +226 @@
-        NSParameterAssert(!inGroup || [inGroup canContainObject:self]);
-        if (![containingObjects containsObject:inGroup]) {
+                
-                //XXX multiple containers
-(!inGroup) {
+ (!inGroup)
-                        [containingObjects removeAllObjects];
-} 
+
-                        AIListObject<AIContainingObject> *container = self.containingObject;
-                        if(container)

trunk/Frameworks/Adium Framework/Source/AIMetaContact.m

@@ -138 +138 @@
-
-        [super setContainingObject:inGroup];
+}
+
+- (AIListContact *)parentContact
+{
+        return self;
+}
+
+- (AIMetaContact *)metaContact
+{
+        return self;
-}
-
@@ -309 +319 @@
-- (void)removeObject:(AIListObject *)inObject
-{
+        AIListContact *contact = (AIListContact *)inObject;
-        if ([self.containedObjects containsObjectIdenticalTo:inObject]) {
-                BOOL    noteRemoteGroupingChanged = NO;
@@ -318 +329 @@
-                [_containedObjects removeObject:inObject];
-                
-[(AIListContact *)inObject remoteGroupName]
+contact.remoteGroupName
-                        //Reset it to its remote group
-inObject.containingObject == self
-[inObject setContainingObject:nil]
+contact.metaContact
+contact.containingObject = nil
-                        noteRemoteGroupingChanged = YES;
-                } else {
-[inObject setContainingObject:self.containingObject]
+contact.containingObject = self.containingObject
-                }
-
@@ -340 +351 @@
-
-                //If we remove our list object, don't continue to show up in the contact list
-
+/*
-                        [self setContainingObject:nil];
-
+*/
-
-                /* Now that we're done reconfigured ourselves and the recently removed object,

trunk/Frameworks/Adium Framework/Source/AIUserIcons.m

@@ -17 +17 @@
-#import <Adium/AIListContact.h>
-#import <Adium/AIListObject.h>
+#import <Adium/AIMetaContact.h>
-#import <Adium/AIUserIcons.h>
-#import <Adium/AIAdiumProtocol.h>
@@ -130 +131 @@
-+ (void)notifyOfChangedIconForObject:(AIListObject *)inObject
-{
-        AIListObject    *containingObject = inObject.containingObject;
-        NSSet                   *modifiedKeys = [NSSet setWithObject:KEY_USER_ICON];
-        
@@ -137 +137 @@
-                                                                                          modifiedKeys:modifiedKeys];           
-        
-containingObject isKindOfClass:[AIListContact class]]
+inObject isKindOfClass:[AIListContact class]] && ((AIListContact *)inObject).metaContact
-                //Notify
-containingObje
+((AIListContact *)inObject).metaConta
-                                                                                                  modifiedKeys:modifiedKeys];
-        }       

trunk/Plugins/Dual Window Interface/AIAccountSelectionView.m

@@ -385 +385 @@
- * @brief Returns YES if a choice of destination contact is available
- */
-
-
-
-
-
-
-
+
+
+
+
+
-}
-

trunk/Plugins/Dual Window Interface/AIMessageViewController.m

@@ -39 +39 @@
-#import <Adium/AIContentMessage.h>
-#import <Adium/AIListContact.h>
+#import <Adium/AIMetaContact.h>
-#import <Adium/AIListObject.h>
-#import <Adium/AIListOutlineView.h>
@@ -595 +596 @@
-- (IBAction)sendMessageLater:(id)sender
-{
-        AIListContact   *listContact;
-
-        //If the chat can _now_ send a message, send it immediately instead of waiting for "later".
-        if ([chat messageSendingAbility] == AIChatCanSendMessageNow) {
@@ -604 +603 @@
-
-        //Put the alert on the metaContact containing this listContact if applicable
-listContact = chat.listObject.parent
+AIMetaContact *listContact = chat.listObject.meta
-
-        if (listContact) {

trunk/Source/AIChatController.m

@@ -304 +304 @@
-                
-                //If this object is within a meta contact, and a chat for an object in that meta contact already exists
-parentContact != targetContact && chat.listObject.parentContact == targetContact.parent
+metaContact && chat.listObject.metaContact == targetContact.meta
-
-                        //Switch the chat to be on this contact (and its account) now

trunk/Source/AIContactController.m

@@ -279 +279 @@
-        [[inContact retain] autorelease];
-        
-
-
-
+
-                
-                /* If inContact's containingObject is a metaContact, and that metaContact has no containingObject,
-                 * use inContact's remote grouping as the metaContact's grouping.
-                 */
-containingObje
+inContact.metaConta
-                        //If no similar objects exist, we add this contact directly to the list
-                        //Create a group for the contact even if contact list groups aren't on,
@@ -296 +294 @@
-                                                  contactList);
-                        
-containingObje
-
-containingObje
+inContact.metaConta
+
+inContact.metaConta
-                        [adium.notificationCenter postNotificationName:@"Contact_ListChanged"
-                                                                                                                                object:localGroup.containingObject
@@ -319 +317 @@
-                                                  toGroup:localGroup];
-                
-containingObject
+inContact.groups.count > 0
-                //If !remoteGroupName, remove the contact from any local groups
-
-
-
+
+
+
+
-                
-                //NSLog(@"contactRemoteGroupingChanged: %@: -- !remoteGroupName so removed from %@",inContact,containingObject);
@@ -339 +338 @@
-- (void)_moveContactLocally:(AIListContact *)listContact toGroup:(AIListGroup *)localGroup
-{
-        AIListObject    *containingObject;
-        AIListObject    *existingObject;
-        BOOL                    performedGrouping = NO;
@@ -350 +348 @@
-        
-        //Remove this object from any local groups we have it in currently
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-                if ((existingObject = [localGroup objectWithService:[listContact service] UID:[listContact UID]])) {
-                        //If an object exists in this group with the same UID and serviceID, create a MetaContact
@@ -398 +394 @@
-        if ([inContact isKindOfClass:[AIMetaContact class]]) {
-                //For a metaContact, the closest we have to a remote group is the group it is within locally
-
+
+
-                
-        } else {