Changeset 3344

Timestamp:

08/27/06 17:40:40 (2 years ago)

Author:

timothy

Message:

Chat Core refactoring to use the new @property syntax if the minimum target OS is 10.5 or greater. Renamed many local variables to prevent conflicts with the property names.

Files:

• trunk/Basic.pch (modified) (1 diff)
• trunk/Chat Core/MVChatConnection.h (modified) (7 diffs)
• trunk/Chat Core/MVChatConnection.m (modified) (16 diffs)
• trunk/Chat Core/MVChatPluginManager.h (modified) (1 diff)
• trunk/Chat Core/MVChatPluginManager.m (modified) (2 diffs)
• trunk/Chat Core/MVChatRoom.h (modified) (8 diffs)
• trunk/Chat Core/MVChatRoom.m (modified) (24 diffs)
• trunk/Chat Core/MVChatUser.h (modified) (4 diffs)
• trunk/Chat Core/MVChatUser.m (modified) (13 diffs)
• trunk/Chat Core/MVChatUserWatchRule.h (modified) (2 diffs)
• trunk/Chat Core/MVChatUserWatchRule.m (modified) (8 diffs)
• trunk/Chat Core/MVFileTransfer.h (modified) (4 diffs)
• trunk/Chat Core/MVFileTransfer.m (modified) (10 diffs)
• trunk/Chat Core/MVIRCChatConnection.m (modified) (15 diffs)
• trunk/Chat Core/MVIRCChatRoom.m (modified) (4 diffs)
• trunk/Chat Core/MVIRCChatUser.m (modified) (2 diffs)
• trunk/Chat Core/MVIRCFileTransfer.m (modified) (1 diff)
• trunk/Chat Core/MVSILCChatConnection.m (modified) (8 diffs)
• trunk/Chat Core/MVSILCChatRoom.m (modified) (4 diffs)
• trunk/Chat Core/MVSILCChatUser.m (modified) (2 diffs)
• trunk/Chat Core/MVSILCFileTransfer.m (modified) (2 diffs)
• trunk/Colloquy.pch (modified) (1 diff)
• trunk/Plug-Ins/AppleScript Support/JVAppleScriptPluginLoader.m (modified) (1 diff)
• trunk/Plug-Ins/F-Script Support/JVFScriptPluginLoader.m (modified) (1 diff)
• trunk/Plug-Ins/JavaScript Support/JVJavaScriptPluginLoader.m (modified) (1 diff)
• trunk/Plug-Ins/Python Support/JVPythonPluginLoader.m (modified) (1 diff)
• trunk/Plug-Ins/Standard Commands/JVStandardCommands.m (modified) (2 diffs)

trunk/Basic.pch

@@ -2 +2 @@
-#import <Cocoa/Cocoa.h>
-#endif
+
+#ifndef MAC_OS_X_VERSION_10_4
+#define MAC_OS_X_VERSION_10_5 1050
+#endif

trunk/Chat Core/MVChatConnection.h

@@ -124 +124 @@
-#pragma mark -
-
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+@property(readonly) MVChatConnectionType type;
+
+@property(readonly) NSSet *supportedFeatures;
+@property(readonly) const NSStringEncoding *supportedStringEncodings;
+
+@property(readonly) NSError *lastError;
+
+@property(readonly) NSString *urlScheme;
+@property(readonly) NSURL *url;
+
+@property NSStringEncoding encoding;
+
+@property(bycopy) NSString *realName;
+
+@property(bycopy) NSString *nickname;
+@property(readonly) NSString *preferredNickname;
+
+@property(bycopy) NSArray *alternateNicknames;
+@property(readonly) NSString *nextAlternateNickname;
+
+@property(bycopy) NSString *nicknamePassword;
+
+@property(readonly) NSString *certificateServiceName;
+@property(readonly) NSString *certificatePassword;
+
+@property(bycopy) NSString *password;
+
+@property(bycopy) NSString *username;
+
+@property(bycopy) NSString *server;
+
+@property unsigned short serverPort;
+
+@property MVChatMessageFormat outgoingChatFormat;
+
+@property(bycopy) NSString *proxyUsername;
+
+@property(bycopy) NSString *proxyPassword;
+
+@property BOOL secure;
+
+@property(bycopy) NSDictionary *persistentInformation;
+
+@property MVChatConnectionProxy proxyType;
+
+@property(bycopy) NSString *proxyServer;
+
+@property unsigned short proxyServerPort;
+
+@property(readonly) NSSet *joinedChatRooms;
+@property(readonly) NSCharacterSet *chatRoomNamePrefixes;
+
+@property(readonly) NSSet *knownChatUsers;
+@property(readonly) MVChatUser *localUser;
+
+@property(readonly) NSSet *chatUserWatchRules;
+
+@property(bycopy) NSAttributedString *awayStatusMessage;
+
+@property(readonly) BOOL connected;
+@property(readonly) BOOL waitingToReconnect;
+@property(readonly) MVChatConnectionStatus status;
+@property(readonly) unsigned int lag;
+
+#else
+
-- (MVChatConnectionType) type;
-
@@ -129 +196 @@
-
-- (NSSet *) supportedFeatures;
+- (const NSStringEncoding *) supportedStringEncodings;
+
+#pragma mark -
+
+- (NSError *) lastError;
+
+#pragma mark -
+
+- (NSString *) urlScheme;
+- (NSURL *) url;
+
+#pragma mark -
+
+- (void) setEncoding:(NSStringEncoding) encoding;
+- (NSStringEncoding) encoding;
+
+#pragma mark -
+
+- (void) setRealName:(NSString *) name;
+- (NSString *) realName;
+
+#pragma mark -
+
+- (void) setNickname:(NSString *) nickname;
+- (NSString *) nickname;
+- (NSString *) preferredNickname;
+
+#pragma mark -
+
+- (void) setAlternateNicknames:(NSArray *) nicknames;
+- (NSArray *) alternateNicknames;
+- (NSString *) nextAlternateNickname;
+
+#pragma mark -
+
+- (void) setNicknamePassword:(NSString *) password;
+- (NSString *) nicknamePassword;
+
+#pragma mark -
+
+- (NSString *) certificateServiceName;
+- (NSString *) certificatePassword;
+
+#pragma mark -
+
+- (void) setPassword:(NSString *) password;
+- (NSString *) password;
+
+#pragma mark -
+
+- (void) setUsername:(NSString *) username;
+- (NSString *) username;
+
+#pragma mark -
+
+- (void) setServer:(NSString *) server;
+- (NSString *) server;
+
+#pragma mark -
+
+- (void) setServerPort:(unsigned short) port;
+- (unsigned short) serverPort;
+
+#pragma mark -
+
+- (void) setOutgoingChatFormat:(MVChatMessageFormat) format;
+- (MVChatMessageFormat) outgoingChatFormat;
+
+#pragma mark -
+
+- (void) setProxyUsername:(NSString *) username;
+- (NSString *) proxyUsername;
+
+#pragma mark -
+
+- (void) setProxyPassword:(NSString *) password;
+- (NSString *) proxyPassword;
+
+#pragma mark -
+
+- (void) setSecure:(BOOL) ssl;
+
+#pragma mark -
+
+- (void) setPersistentInformation:(NSDictionary *) information;
+- (NSDictionary *) persistentInformation;
+
+#pragma mark -
+
+- (void) setProxyType:(MVChatConnectionProxy) type;
+- (MVChatConnectionProxy) proxyType;
+
+#pragma mark -
+
+- (void) setProxyServer:(NSString *) address;
+- (NSString *) proxyServer;
+
+#pragma mark -
+
+- (void) setProxyServerPort:(unsigned short) port;
+- (unsigned short) proxyServerPort;
+
+#pragma mark -
+
+- (NSSet *) joinedChatRooms;
+- (NSCharacterSet *) chatRoomNamePrefixes;
+
+#pragma mark -
+
+- (NSSet *) knownChatUsers;
+- (MVChatUser *) localUser;
+
+#pragma mark -
+
+- (NSSet *) chatUserWatchRules;
+
+#pragma mark -
+
+- (NSAttributedString *) awayStatusMessage;
+- (void) setAwayStatusMessage:(NSAttributedString *) message;
+
+#pragma mark -
+
+- (MVChatConnectionStatus) status;
+- (unsigned int) lag;
+#endif
+
+#pragma mark -
+
+- (BOOL) isSecure;
+- (BOOL) isConnected;
+- (BOOL) isWaitingToReconnect;
+
+#pragma mark -
+
-- (BOOL) supportsFeature:(NSString *) key;
-
-#pragma mark -
-
-- (const NSStringEncoding *) supportedStringEncodings;
-- (BOOL) supportsStringEncoding:(NSStringEncoding) encoding;
-
@@ -145 +343 @@
-#pragma mark -
-
-- (NSError *) lastError;
-
-#pragma mark -
-
-- (NSString *) urlScheme;
-- (NSURL *) url;
-
-#pragma mark -
-
-- (void) setEncoding:(NSStringEncoding) encoding;
-- (NSStringEncoding) encoding;
-
-#pragma mark -
-
-- (void) setRealName:(NSString *) name;
-- (NSString *) realName;
-
-- (void) setNickname:(NSString *) nickname;
-- (NSString *) nickname;
-- (NSString *) preferredNickname;
-
-- (void) setAlternateNicknames:(NSArray *) nicknames;
-- (NSArray *) alternateNicknames;
-- (NSString *) nextAlternateNickname;
-
-- (void) setNicknamePassword:(NSString *) password;
-- (NSString *) nicknamePassword;
-
-- (NSString *) certificateServiceName;
-- (BOOL) setCertificatePassword:(NSString *) password;
-- (NSString *) certificatePassword;
-
-- (void) setPassword:(NSString *) password;
-- (NSString *) password;
-
-- (void) setUsername:(NSString *) username;
-- (NSString *) username;
-
-- (void) setServer:(NSString *) server;
-- (NSString *) server;
-
-- (void) setServerPort:(unsigned short) port;
-- (unsigned short) serverPort;
-
-- (void) setOutgoingChatFormat:(MVChatMessageFormat) format;
-- (MVChatMessageFormat) outgoingChatFormat;
-
-- (void) setProxyUsername:(NSString *) username;
-- (NSString *) proxyUsername;
-
-- (void) setProxyPassword:(NSString *) password;
-- (NSString *) proxyPassword;
-
-- (void) setSecure:(BOOL) ssl;
-- (BOOL) isSecure;
-
-- (void) setPersistentInformation:(NSDictionary *) information;
-- (NSDictionary *) persistentInformation;
-
-- (void) publicKeyVerified:(NSDictionary *) dictionary andAccepted:(BOOL) accepted andAlwaysAccept:(BOOL) alwaysAccept;
-
-#pragma mark -
-
-- (void) setProxyType:(MVChatConnectionProxy) type;
-- (MVChatConnectionProxy) proxyType;
-
-- (void) setProxyServer:(NSString *) address;
-- (NSString *) proxyServer;
-
-- (void) setProxyServerPort:(unsigned short) port;
-- (unsigned short) proxyServerPort;
-
-#pragma mark -
@@ -234 +363 @@
-#pragma mark -
-
-- (NSSet *) joinedChatRooms;
-- (MVChatRoom *) joinedChatRoomWithName:(NSString *) room;
-
-#pragma mark -
-
-- (NSCharacterSet *) chatRoomNamePrefixes;
-- (NSString *) properNameForChatRoomNamed:(NSString *) room;
-
-#pragma mark -
-
-- (NSSet *) knownChatUsers;
-- (NSSet *) chatUsersWithNickname:(NSString *) nickname;
-- (NSSet *) chatUsersWithFingerprint:(NSString *) fingerprint;
-- (MVChatUser *) chatUserWithUniqueIdentifier:(id) identifier;
-- (MVChatUser *) localUser;
-
-#pragma mark -
@@ -255 +380 @@
-- (void) removeChatUserWatchRule:(MVChatUserWatchRule *) rule;
-
-
-
-
+
+
-- (void) fetchChatRoomList;
-- (void) stopFetchingChatRoomList;
@@ -264 +388 @@
-#pragma mark -
-
-- (NSAttributedString *) awayStatusMessage;
-- (void) setAwayStatusWithMessage:(NSAttributedString *) message;
-- (void) clearAwayStatus;
-
-#pragma mark -
-
-- (BOOL) isConnected;
-- (MVChatConnectionStatus) status;
-- (unsigned int) lag;
-
-#pragma mark -
-
-- (void) scheduleReconnectAttemptEvery:(NSTimeInterval) seconds;
-- (void) cancelPendingReconnectAttempts;
-- (BOOL) isWaitingToReconnect;
-@end
-
@@ -284 +395 @@
-
-@interface MVChatConnection (MVChatConnectionScripting)
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+@property(readonly) NSNumber *uniqueIdentifier;
+#endif
+
-- (NSNumber *) uniqueIdentifier;
-@end

trunk/Chat Core/MVChatConnection.m

@@ -91 +91 @@
-}
-
-t
+connectionT
-        [self release];
-
-t
+connectionT
-                self = [[MVIRCChatConnection allocWithZone:nil] init];
-t
+connectionT
-                self = [[MVSILCChatConnection allocWithZone:nil] init];
-        } else self = nil;
@@ -103 +103 @@
-}
-
-url
-url
-
-t
-url scheme] isEqualToString:@"irc"] ) t
-url scheme] isEqualToString:@"silc"] ) t
-
-url host] type:type port:[[url port] unsignedShortValue] user:[url
-url
-
-url fragment] && [[url
-url
-url path] && [[url
-url
+serverURL
+serverURL
+
+connectionT
+serverURL scheme] isEqualToString:@"irc"] ) connectionT
+serverURL scheme] isEqualToString:@"silc"] ) connectionT
+
+serverURL host] type:connectionType port:[[serverURL port] unsignedShortValue] user:[serverURL
+serverURL
+
+serverURL fragment] && [[serverURL
+serverURL
+serverURL path] && [[serverURL
+serverURL
-                }
-        }
@@ -123 +123 @@
-}
-
- type:(MVChatConnectionType) type port:(unsigned short) port user:(NSString *) n
-t
-nickname length] ) [self setNickname:n
- length] ) [self setServer:server
+Address type:(MVChatConnectionType) serverType port:(unsigned short) port user:(NSString *) localN
+serverT
+localNickname length] ) [self setNickname:localN
+Address length] ) [self setServer:serverAddress
-                [self setServerPort:port];
-        }
@@ -204 +204 @@
-}
-
-e
+supportedE
-        const NSStringEncoding *encodings = [self supportedStringEncodings];
-        unsigned i = 0;
-
-        for( i = 0; encodings[i]; i++ )
-e
+supportedE
-
-        return NO;
@@ -221 +221 @@
-}
-
-server onPort:(unsigned short) port asUser:(NSString *) nickname
-name length] ) [self setNickname:nickname
-server length] ) [self setServer:server
+address onPort:(unsigned short) port asUser:(NSString *) nick
+ length] ) [self setNickname:nick
+address length] ) [self setServer:address
-        [self setServerPort:port];
-        [self disconnect];
@@ -253 +253 @@
-
-- (NSURL *) url {
-
- ) return [NSURL URLWithString:url
-
-
-
-
-
-e
-e
-e
+String
+String ) return [NSURL URLWithString:urlString
+
+
+
+
+
+newE
+newE
+newE
-}
-
@@ -323 +323 @@
-#pragma mark -
-
-p
+newP
-        id old = _npassword;
-password length] ) _npassword = [p
+newPassword length] ) _npassword = [newP
-        else _npassword = nil;
-        [old release];
@@ -416 +416 @@
-}
-
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+@property(getter=isSecure, setter=setSecure:) BOOL secure;
+#endif
+
-- (BOOL) isSecure {
-        return _secure;
@@ -422 +426 @@
-#pragma mark -
-
-t
-t
+newT
+newT
-}
-
@@ -454 +458 @@
-#pragma mark -
-
-u
+newU
-        id old = _proxyUsername;
-u
+newU
-        [old release];
-}
@@ -466 +470 @@
-#pragma mark -
-
-p
+newP
-        id old = _proxyPassword;
-p
+newP
-        [old release];
-}
@@ -710 +714 @@
-}
-
-With
-
-
-
-
-
-
-
-
-pragma mark -
+
+
+
+
+
+
+
+
+
+endif
-
-- (BOOL) isConnected {
-BOOL) (
+
-}
-
@@ -750 +754 @@
-}
-
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+@property(readonly, getter=isWaitingToReconnect) BOOL waitingToReconnect;
+#endif
+
-- (BOOL) isWaitingToReconnect {
-        return ( ! [self isConnected] && _reconnectTimer ? YES : NO );
@@ -861 +869 @@
-}
-
-s
-s
+newS
+newS
-}
-
@@ -1001 +1009 @@
-        if( [message isKindOfClass:[NSTextStorage class]] ) msg = [message string];
-        NSAttributedString *attributeMsg = [NSAttributedString attributedStringWithHTMLFragment:msg baseURL:nil];
-With
+
-}
-
@@ -1010 +1018 @@
-}
-
-e
-e
+newE
+newE
-}
-

trunk/Chat Core/MVChatPluginManager.h

@@ -9 +9 @@
-+ (NSArray *) pluginSearchPaths;
-
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+@property(readonly) NSArray *plugins;
+#else
+- (NSArray *) plugins;
+#endif
+
-- (void) reloadPlugins;
-- (void) addPlugin:(id) plugin;
-- (void) removePlugin:(id) plugin;
-
-- (NSArray *) plugins;
-- (NSArray *) pluginsThatRespondToSelector:(SEL) selector;
-- (NSArray *) pluginsOfClass:(Class) class thatRespondToSelector:(SEL) selector;
-
-- (NSEnumerator *) pluginEnumerator;
-- (NSEnumerator *) enumeratorOfPluginsThatRespondToSelector:(SEL) selector;
-- (NSEnumerator *) enumeratorOfPluginsOfClass:(Class) class thatRespondToSelector:(SEL) selector;
-
-- (unsigned int) numberOfPlugins;
-- (unsigned int) numberOfPluginsThatRespondToSelector:(SEL) selector;
-- (unsigned int) numberOfPluginsOfClass:(Class) class thatRespondToSelector:(SEL) selector;
-
-- (NSArray *) makePluginsPerformInvocation:(NSInvocation *) invocation;

trunk/Chat Core/MVChatPluginManager.m

@@ -138 +138 @@
-#pragma mark -
-
-- (NSEnumerator *) pluginEnumerator {
-        return [_plugins objectEnumerator];
-}
-
-- (NSEnumerator *) enumeratorOfPluginsThatRespondToSelector:(SEL) selector {
-        return [self enumeratorOfPluginsOfClass:NULL thatRespondToSelector:selector];
-}
-
-- (NSEnumerator *) enumeratorOfPluginsOfClass:(Class) class thatRespondToSelector:(SEL) selector {
-        return [[self pluginsOfClass:class thatRespondToSelector:selector] objectEnumerator];
-}
-
-#pragma mark -
-
-- (unsigned int) numberOfPlugins {
-        return [_plugins count];
-}
-
-- (unsigned int) numberOfPluginsThatRespondToSelector:(SEL) selector {
-        return [self numberOfPluginsOfClass:NULL thatRespondToSelector:selector];
-}
-
-- (unsigned int) numberOfPluginsOfClass:(Class) class thatRespondToSelector:(SEL) selector {
-        NSParameterAssert( selector != NULL );
-
-        unsigned int ret = 0;
-        NSEnumerator *enumerator = [_plugins objectEnumerator];
-        id plugin = nil;
-
-        while( ( plugin = [enumerator nextObject] ) )
-                if( ( ! class || ( class && [plugin isKindOfClass:class] ) ) && [plugin respondsToSelector:selector] )
-                        ret++;
-
-        return ret;
-}
-
-#pragma mark -
-
-- (NSArray *) makePluginsPerformInvocation:(NSInvocation *) invocation {
-        return [self makePluginsPerformInvocation:invocation stoppingOnFirstSuccessfulReturn:NO];
@@ -188 +150 @@
-        NSParameterAssert( [invocation selector] != NULL );
-
-self enumeratorOfPluginsOfClass:class thatRespondToSelector:[invocation selector]
+[self pluginsOfClass:class thatRespondToSelector:[invocation selector]] objectEnumerator
-        id plugin = nil;
-

trunk/Chat Core/MVChatRoom.h

@@ -59 +59 @@
-        NSDate *_dateJoined;
-        NSDate *_dateParted;
-Data
+
-        MVChatUser *_topicAuthor;
-        NSDate *_dateTopicChanged;
@@ -72 +72 @@
-        BOOL _releasing;
-}
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+@property(readonly, ivar) MVChatConnection *connection;
+
+@property(readonly) NSURL *url;
+@property(readonly, ivar) NSString *name;
+@property(readonly) NSString *displayName;
+@property(readonly, ivar) id uniqueIdentifier;
+
+@property(readonly) BOOL joined;
+@property(readonly, ivar) NSDate *dateJoined;
+@property(readonly, ivar) NSDate *dateParted;
+
+@property(ivar) NSStringEncoding encoding;
+
+@property(readonly, ivar) NSData *topic;
+@property(readonly, ivar) MVChatUser *topicAuthor;
+@property(readonly, ivar) NSDate *dateTopicChanged;
+
+@property(readonly) NSSet *supportedAttributes;
+@property(readonly) NSDictionary *attributes;
+
+@property(readonly) unsigned long supportedModes;
+@property(readonly) unsigned long supportedMemberUserModes;
+@property(readonly, ivar) unsigned long modes;
+
+@property(readonly) NSSet *memberUsers;
+@property(readonly) NSSet *bannedUsers;
+
+#else
+
-- (MVChatConnection *) connection;
+
+- (NSURL *) url;
+- (NSString *) name;
+- (NSString *) displayName;
+- (id) uniqueIdentifier;
+
+- (NSDate *) dateJoined;
+- (NSDate *) dateParted;
+
+- (NSStringEncoding) encoding;
+- (void) setEncoding:(NSStringEncoding) encoding;
+
+- (NSData *) topic;
+- (MVChatUser *) topicAuthor;
+- (NSDate *) dateTopicChanged;
+
+- (NSSet *) supportedAttributes;
+- (NSDictionary *) attributes;
+
+- (unsigned long) supportedModes;
+- (unsigned long) supportedMemberUserModes;
+- (unsigned long) modes;
+
+- (NSSet *) memberUsers;
+- (NSSet *) bannedUsers;
+#endif
-
-- (BOOL) isEqual:(id) object;
@@ -80 +137 @@
-- (NSComparisonResult) compareByUserCount:(MVChatRoom *) otherRoom;
-
-
-
-
-
+
-
-- (void) join;
@@ -89 +143 @@
-- (void) partWithReason:(NSAttributedString *) reason;
-
-
-
-
-
-
-
+
-
-- (void) sendMessage:(NSAttributedString *) message asAction:(BOOL) action;
@@ -102 +151 @@
-- (void) sendSubcodeReply:(NSString *) command withArguments:(id) arguments;
-
-- (NSData *) topic;
-- (MVChatUser *) topicAuthor;
-- (void) setTopic:(NSAttributedString *) topic;
-
-- (void) refreshAttributes;
-- (void) refreshAttributeForKey:(NSString *) key;
-
-- (NSSet *) supportedAttributes;
-
-- (NSDictionary *) attributes;
-- (BOOL) hasAttributeForKey:(NSString *) key;
-- (id) attributeForKey:(NSString *) key;
-- (void) setAttribute:(id) attribute forKey:(id) key;
-
-- (unsigned long) supportedModes;
-
-- (unsigned long) modes;
-- (id) attributeForMode:(MVChatRoomMode) mode;
-
@@ -126 +165 @@
-- (void) removeMode:(MVChatRoomMode) mode;
-
-- (NSSet *) memberUsers;
-- (NSSet *) memberUsersWithModes:(unsigned long) modes;
-- (NSSet *) memberUsersWithNickname:(NSString *) nickname;
@@ -135 +173 @@
-- (void) kickOutMemberUser:(MVChatUser *) user forReason:(NSAttributedString *) reason;
-
-- (NSSet *) bannedUsers;
-- (void) addBanForUser:(MVChatUser *) user;
-- (void) removeBanForUser:(MVChatUser *) user;
-
-- (unsigned long) supportedMemberUserModes;
-
-- (unsigned long) modesForMemberUser:(MVChatUser *) user;
@@ -151 +186 @@
-
-@interface MVChatRoom (MVChatRoomScripting)
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+@property(readonly) NSString *scriptUniqueIdentifier;
+@property(readonly) NSScriptObjectSpecifier *objectSpecifier;
+#endif
+
-- (NSString *) scriptUniqueIdentifier;
-- (NSScriptObjectSpecifier *) objectSpecifier;

trunk/Chat Core/MVChatRoom.m

@@ -53 +53 @@
-- (id) init {
-        if( ( self = [super init] ) ) {
-                _connection = nil;
-                _name = nil;
-                _uniqueIdentifier = nil;
-                _dateJoined = nil;
-                _dateParted = nil;
-                _topicData = nil;
-                _topicAuthor = nil;
-                _dateTopicChanged = nil;
-                _attributes = [[NSMutableDictionary allocWithZone:nil] initWithCapacity:2];
-                _memberUsers = [[NSMutableSet allocWithZone:nil] initWithCapacity:100];
@@ -67 +59 @@
-                _memberModes = [[NSMutableDictionary allocWithZone:nil] initWithCapacity:100];
-                _encoding = NSUTF8StringEncoding;
-                _modes = 0;
-        }
-
@@ -87 +78 @@
-        [_dateJoined release];
-        [_dateParted release];
-Data
+
-        [_topicAuthor release];
-        [_dateTopicChanged release];
@@ -101 +92 @@
-        _dateJoined = nil;
-        _dateParted = nil;
-Data
+
-        _topicAuthor = nil;
-        _dateTopicChanged = nil;
@@ -115 +106 @@
-#pragma mark -
-
+#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4
-- (MVChatConnection *) connection {
-        return _connection;
-}
+#endif
-
-#pragma mark -
@@ -157 +150 @@
-
-- (NSURL *) url {
-
- ) return [NSURL URLWithString:url
+String
+String ) return [NSURL URLWithString:urlString
-        return nil;
-}
-
+#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4
-- (NSString *) name {
-        return [[_name retain] autorelease];
-}
+#endif
-
-- (NSString *) displayName {
@@ -170 +165 @@
-}
-
+#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4
-- (id) uniqueIdentifier {
-        return [[_uniqueIdentifier retain] autorelease];
-}
+#endif
-
-#pragma mark -
@@ -194 +191 @@
-#pragma mark -
-
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+@property(readonly, getter=isJoined) BOOL joined;
+#endif
+
-- (BOOL) isJoined {
-        return ( [self dateJoined] && ! [self dateParted] );
-}
-
+#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4
-- (NSDate *) dateJoined {
-        return [[_dateJoined retain] autorelease];
@@ -205 +207 @@
-        return [[_dateParted retain] autorelease];
-}
-
-
-
+
+
+
+
+
-- (NSStringEncoding) encoding {
-        return _encoding;
@@ -215 +219 @@
-        _encoding = encoding;
-}
+#endif
-
-#pragma mark -
@@ -239 +244 @@
-#pragma mark -
-
+#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4
-- (NSData *) topic {
-
-
-
+
+
+
+
+
+
+
+
+
-- (MVChatUser *) topicAuthor {
-        return [[_topicAuthor retain] autorelease];
@@ -250 +262 @@
-        return [[_dateTopicChanged retain] autorelease];
-}
-
-
-
-
+
-
-#pragma mark -
@@ -314 +323 @@
-#pragma mark -
-
+#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4
-- (unsigned long) modes {
-        return _modes;
-}
+#endif
-
-- (id) attributeForMode:(MVChatRoomMode) mode {
@@ -327 +338 @@
-#pragma mark -
-
-m
-m
+newM
+newM
-
-        unsigned long curModes = [self modes];
-m
+newM
-
-        unsigned i = 0;
-        for( i = 0; i <= 8; i++ ) {
-                if( ( 1 << i ) & diffModes ) {
-m
+newM
-                        else [self removeMode:( 1 << i )];
-                }
@@ -364 +375 @@
-}
-
-m
+newM
-        NSMutableSet *users = [[NSMutableSet allocWithZone:nil] init];
-
@@ -371 +382 @@
-                MVChatUser *user = nil;
-                while( ( user = [enumerator nextObject] ) )
-m
+newM
-                                [users addObject:user];
-        }
@@ -468 +479 @@
-#pragma mark -
-
-m
+newM
-        NSParameterAssert( user != nil );
-m
+newM
-
-        unsigned long curModes = [self modesForMemberUser:user];
-m
+newM
-
-        unsigned i = 0;
-        for( i = 0; i <= 8; i++ ) {
-                if( ( 1 << i ) & diffModes ) {
-m
+newM
-                        else [self removeMode:( 1 << i ) forMemberUser:user];
-                }
@@ -546 +557 @@
-}
-
-m
+newM
-        @synchronized( _memberModes ) {
-m
+newM
-        }       
-}
@@ -554 +565 @@
-- (void) _setMode:(MVChatRoomMe