Changeset 2603

Show
Ignore:
Timestamp:
05/02/05 21:26:05 (4 years ago)
Author:
eridius
Message:

Do a little judicious renaming.
And here is a test of a potential Trac bug: whee!
if there is a [[BR]] then the bug is there.
Test two: whee!
Note that there was a space on that one

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/JVBehaviorPreferences.m

    r2558 r2603  
    8383        [[NSUserDefaults standardUserDefaults] setBool:(BOOL)[sender state] forKey:@"JVSortRoomMembersByStatus"]; 
    8484 
    85         NSEnumerator *enumerator = [[[JVChatController defaultManager] chatViewControllersOfClass:[JVChatRoomPanel class]] objectEnumerator]; 
     85        NSEnumerator *enumerator = [[[JVChatController defaultController] chatViewControllersOfClass:[JVChatRoomPanel class]] objectEnumerator]; 
    8686        JVChatRoomPanel *room = nil; 
    8787        while( ( room = [enumerator nextObject] ) ) 

  • trunk/JVBuddy.m

    r2564 r2603  
    9898 
    9999        while( ( user = [enumerator nextObject] ) ) { 
    100                 connectionEnumerator = [[[MVConnectionsController defaultManager] connectionsForServerAddress:[user serverAddress]] objectEnumerator]; 
     100                connectionEnumerator = [[[MVConnectionsController defaultController] connectionsForServerAddress:[user serverAddress]] objectEnumerator]; 
    101101                while( ( connection = [connectionEnumerator nextObject] ) ) 
    102102                        [connection startWatchingUser:user]; 
    …… 
    111111 
    112112        while( ( user = [enumerator nextObject] ) ) { 
    113                 connectionEnumerator = [[[MVConnectionsController defaultManager] connectionsForServerAddress:[user serverAddress]] objectEnumerator]; 
     113                connectionEnumerator = [[[MVConnectionsController defaultController] connectionsForServerAddress:[user serverAddress]] objectEnumerator]; 
    114114                while( ( connection = [connectionEnumerator nextObject] ) ) 
    115115                        [connection stopWatchingUser:user]; 
    …… 
    471471 
    472472- (void) _disconnected:(NSNotification *) notification { 
    473         NSEnumerator *enumerator = [[[MVConnectionsController defaultManager] connections] objectEnumerator]; 
     473        NSEnumerator *enumerator = [[[MVConnectionsController defaultController] connections] objectEnumerator]; 
    474474        MVChatConnection *connection = nil; 
    475475        unsigned int count = 0; 
    …… 
    499499@implementation JVBuddy (JVBuddyScripting) 
    500500- (NSDictionary *) activeNicknameDictionary { 
    501         MVChatConnection *connection = [[MVConnectionsController defaultManager] connectionForServerAddress:[[self activeNickname] host]]; 
     501        MVChatConnection *connection = [[MVConnectionsController defaultController] connectionForServerAddress:[[self activeNickname] host]]; 
    502502        return [NSDictionary dictionaryWithObjectsAndKeys:connection, @"connection", [[self activeNickname] user], @"nickname", nil]; 
    503503} 
    …… 
    509509 
    510510        while( ( nick = [enumerator nextObject] ) ) { 
    511                 MVChatConnection *connection = [[MVConnectionsController defaultManager] connectionForServerAddress:[nick host]]; 
     511                MVChatConnection *connection = [[MVConnectionsController defaultController] connectionForServerAddress:[nick host]]; 
    512512                if( ! connection ) continue; 
    513513                NSDictionary *info = [NSDictionary dictionaryWithObjectsAndKeys:connection, @"connection", [nick user], @"nickname", nil]; 
    …… 
    524524 
    525525        while( ( nick = [enumerator nextObject] ) ) { 
    526                 MVChatConnection *connection = [[MVConnectionsController defaultManager] connectionForServerAddress:[nick host]]; 
     526                MVChatConnection *connection = [[MVConnectionsController defaultController] connectionForServerAddress:[nick host]]; 
    527527                if( ! connection ) continue; 
    528528                NSDictionary *info = [NSDictionary dictionaryWithObjectsAndKeys:connection, @"connection", [nick user], @"nickname", nil]; 

  • trunk/JVBuddyInspector.m

    r2564 r2603  
    5151 
    5252- (void) willLoad { 
    53         NSEnumerator *enumerator = [[[MVConnectionsController defaultManager] connections] objectEnumerator]; 
     53        NSEnumerator *enumerator = [[[MVConnectionsController defaultController] connections] objectEnumerator]; 
    5454        MVChatConnection *connection = nil; 
    5555 

  • trunk/JVChatConsolePanel.m

    r2600 r2603  
    9090 
    9191- (IBAction) close:(id) sender { 
    92         [[JVChatController defaultManager] disposeViewController:self]; 
     92        [[JVChatController defaultController] disposeViewController:self]; 
    9393} 
    9494 
    …… 
    175175        item = [[[NSMenuItem alloc] initWithTitle:NSLocalizedString( @"Detach From Window", "detach from window contextual menu item title" ) action:@selector( detachView: ) keyEquivalent:@""] autorelease]; 
    176176        [item setRepresentedObject:self]; 
    177         [item setTarget:[JVChatController defaultManager]]; 
     177        [item setTarget:[JVChatController defaultController]]; 
    178178        [menu addItem:item]; 
    179179 

  • trunk/JVChatController.h

    r2558 r2603  
    1818        NSMutableArray *_chatControllers; 
    1919} 
    20 + (JVChatController *) defaultManager; 
     20+ (JVChatController *) defaultController; 
    2121+ (NSMenu *) smartTranscriptMenu; 
    2222+ (void) refreshSmartTranscriptMenu; 

  • trunk/JVChatController.m

    r2602 r2603  
    3030 
    3131@implementation JVChatController 
    32 + (JVChatController *) defaultManager { 
     32+ (JVChatController *) defaultController { 
    3333        extern JVChatController *sharedInstance; 
    3434        return ( sharedInstance ? sharedInstance : ( sharedInstance = [[self alloc] init] ) ); 
    …… 
    5050                [smartTranscriptMenu removeItem:menuItem]; 
    5151 
    52         NSMutableArray *items = [NSMutableArray arrayWithArray:[[[self defaultManager] smartTranscripts] allObjects]]; 
     52        NSMutableArray *items = [NSMutableArray arrayWithArray:[[[self defaultController] smartTranscripts] allObjects]]; 
    5353        [items sortUsingSelector:@selector( compare: )]; 
    5454 
    …… 
    6161                if( [panel newMessagesWaiting] ) [menuItem setImage:[NSImage imageNamed:@"smartTranscriptTabActivity"]]; 
    6262                else [menuItem setImage:[NSImage imageNamed:@"smartTranscriptTab"]]; 
    63                 [menuItem setTarget:[self defaultManager]]; 
     63                [menuItem setTarget:[self defaultController]]; 
    6464                [menuItem setRepresentedObject:panel]; 
    6565                [smartTranscriptMenu addItem:menuItem]; 
    …… 
    7575        menuItem = [[[NSMenuItem alloc] initWithTitle:NSLocalizedString( @"New Smart Transcript...", "new smart transcript menu title" ) action:@selector( _newSmartTranscript: ) keyEquivalent:@"n"] autorelease]; 
    7676        [menuItem setKeyEquivalentModifierMask:(NSCommandKeyMask | NSAlternateKeyMask)]; 
    77         [menuItem setTarget:[JVChatController defaultManager]]; 
     77        [menuItem setTarget:[JVChatController defaultController]]; 
    7878        [smartTranscriptMenu addItem:menuItem]; 
    7979} 
    …… 
    363363- (JVIgnoreMatchResult) shouldIgnoreUser:(MVChatUser *) user withMessage:(NSAttributedString *) message inView:(id <JVChatViewController>) view { 
    364364        JVIgnoreMatchResult ignoreResult = JVNotIgnored; 
    365         NSEnumerator *renum = [[[MVConnectionsController defaultManager] ignoreRulesForConnection:[view connection]] objectEnumerator]; 
     365        NSEnumerator *renum = [[[MVConnectionsController defaultController] ignoreRulesForConnection:[view connection]] objectEnumerator]; 
    366366        KAIgnoreRule *rule = nil; 
    367367 
    …… 
    378378- (void) _joinedRoom:(NSNotification *) notification { 
    379379        MVChatRoom *rm = [notification object]; 
    380         if( ! [[MVConnectionsController defaultManager] managesConnection:[rm connection]] ) return; 
     380        if( ! [[MVConnectionsController defaultController] managesConnection:[rm connection]] ) return; 
    381381        JVChatRoomPanel *room = [self chatViewControllerForRoom:rm ifExists:NO]; 
    382382        [room joined]; 
    …… 
    388388        MVChatConnection *connection = [notification object]; 
    389389 
    390         if( ! [[MVConnectionsController defaultManager] managesConnection:connection] ) return; 
     390        if( ! [[MVConnectionsController defaultController] managesConnection:connection] ) return; 
    391391 
    392392        NSString *title = NSLocalizedString( @"Chat Room Invite", "member invited to room title" ); 
    …… 
    407407        NSData *message = [[notification userInfo] objectForKey:@"message"]; 
    408408 
    409         if( ! [[MVConnectionsController defaultManager] managesConnection:[user connection]] ) return; 
     409        if( ! [[MVConnectionsController defaultController] managesConnection:[user connection]] ) return; 
    410410 
    411411        if( [[[notification userInfo] objectForKey:@"notice"] boolValue] ) { 
    …… 
    553553 
    554554- (IBAction) _newSmartTranscript:(id) sender { 
    555         [[JVChatController defaultManager] newSmartTranscript]; 
     555        [[JVChatController defaultController] newSmartTranscript]; 
    556556} 
    557557@end 
    …… 
    648648                target = [(JVChatRoomMember *)target user]; 
    649649 
    650         JVDirectChatPanel *panel = [[JVChatController defaultManager] chatViewControllerForUser:target ifExists:NO]; 
     650        JVDirectChatPanel *panel = [[JVChatController defaultController] chatViewControllerForUser:target ifExists:NO]; 
    651651        [[panel windowController] showChatViewController:panel]; 
    652652 
    …… 
    666666 
    667667- (NSArray *) chatViews { 
    668         return [[[JVChatController defaultManager] allChatViewControllers] allObjects]; 
     668        return [[[JVChatController defaultController] allChatViewControllers] allObjects]; 
    669669} 
    670670 
    …… 
    674674 
    675675- (id <JVChatViewController>) valueInChatViewsWithUniqueID:(id) identifier { 
    676         NSEnumerator *enumerator = [[[JVChatController defaultManager] allChatViewControllers] objectEnumerator]; 
     676        NSEnumerator *enumerator = [[[JVChatController defaultController] allChatViewControllers] objectEnumerator]; 
    677677        id <JVChatViewController, JVChatListItemScripting> view = nil; 
    678678 
    …… 
    685685 
    686686- (id <JVChatViewController>) valueInChatViewsWithName:(NSString *) name { 
    687         NSEnumerator *enumerator = [[[JVChatController defaultManager] allChatViewControllers] objectEnumerator]; 
     687        NSEnumerator *enumerator = [[[JVChatController defaultController] allChatViewControllers] objectEnumerator]; 
    688688        id <JVChatViewController> view = nil; 
    689689 
    …… 
    709709- (void) removeFromChatViewsAtIndex:(unsigned) index { 
    710710        id <JVChatViewController> view = [[self chatViews] objectAtIndex:index]; 
    711         if( view ) [[JVChatController defaultManager] disposeViewController:view]; 
     711        if( view ) [[JVChatController defaultController] disposeViewController:view]; 
    712712} 
    713713 
    …… 
    719719 
    720720- (NSArray *) chatViewsWithClass:(Class) class { 
    721         return [[[JVChatController defaultManager] chatViewControllersOfClass:class] allObjects]; 
     721        return [[[JVChatController defaultController] chatViewControllersOfClass:class] allObjects]; 
    722722} 
    723723 
    …… 
    743743- (void) removeFromChatViewsAtIndex:(unsigned) index withClass:(Class) class { 
    744744        id <JVChatViewController> view = [[self chatViewsWithClass:class] objectAtIndex:index]; 
    745         if( view ) [[JVChatController defaultManager] disposeViewController:view]; 
     745        if( view ) [[JVChatController defaultController] disposeViewController:view]; 
    746746} 
    747747 

  • trunk/JVChatRoomBrowser.m

    r2561 r2603  
    455455@implementation JVChatRoomBrowser (JVChatRoomBrowserPrivate) 
    456456- (void) _connectionChange:(NSNotification *) notification { 
    457         NSEnumerator *enumerator = [[[MVConnectionsController defaultManager] connections] objectEnumerator]; 
     457        NSEnumerator *enumerator = [[[MVConnectionsController defaultController] connections] objectEnumerator]; 
    458458        MVChatConnection *connection = nil; 
    459459        NSMenu *menu = [[[NSMenu alloc] initWithTitle:@""] autorelease]; 
    …… 
    563563 
    564564- (void) _startFetch { 
    565         JVChatConsolePanel *console = [[JVChatController defaultManager] chatConsoleForConnection:_connection ifExists:YES]; 
     565        JVChatConsolePanel *console = [[JVChatController defaultController] chatConsoleForConnection:_connection ifExists:YES]; 
    566566        [console pause]; 
    567567        [_connection fetchChatRoomList]; 
    …… 
    570570- (void) _stopFetch { 
    571571        [_connection stopFetchingChatRoomList]; 
    572         JVChatConsolePanel *console = [[JVChatController defaultManager] chatConsoleForConnection:_connection ifExists:YES]; 
     572        JVChatConsolePanel *console = [[JVChatController defaultController] chatConsoleForConnection:_connection ifExists:YES]; 
    573573        [console resume]; 
    574574} 

  • trunk/JVChatRoomMember.m

    r2564 r2603  
    319319- (void) handleDraggedFile:(NSString *) path { 
    320320        BOOL passive = [[NSUserDefaults standardUserDefaults] boolForKey:@"JVSendFilesPassively"]; 
    321         [[MVFileTransferController defaultManager] addFileTransfer:[[self user] sendFile:path passively:passive]]; 
     321        [[MVFileTransferController defaultController] addFileTransfer:[[self user] sendFile:path passively:passive]]; 
    322322} 
    323323 
    …… 
    466466- (IBAction) startChat:(id) sender { 
    467467        if( [self isLocalUser] ) return; 
    468         [[JVChatController defaultManager] chatViewControllerForUser:[self user] ifExists:NO]; 
     468        [[JVChatController defaultController] chatViewControllerForUser:[self user] ifExists:NO]; 
    469469} 
    470470 
    …… 
    499499                passive = [passiveButton state]; 
    500500                while( ( path = [enumerator nextObject] ) ) 
    501                         [[MVFileTransferController defaultManager] addFileTransfer:[[self user] sendFile:path passively:passive]]; 
     501                        [[MVFileTransferController defaultController] addFileTransfer:[[self user] sendFile:path passively:passive]]; 
    502502        } 
    503503} 

  • trunk/JVChatRoomPanel.m

    r2595 r2603  
    124124                return NSLocalizedString( @"joining...", "joining status info line in drawer" ); 
    125125        if( [[self connection] isConnected] ) { 
    126                 if( [[[MVConnectionsController defaultManager] connectedConnections] count] == 1 ) 
     126                if( [[[MVConnectionsController defaultController] connectedConnections] count] == 1 ) 
    127127                        return [NSString stringWithFormat:NSLocalizedString( @"%d members", "number of room members information line" ), [_sortedMembers count]]; 
    128128                else return [[self connection] server]; 
    …… 
    206206        item = [[[NSMenuItem alloc] initWithTitle:NSLocalizedString( @"Detach From Window", "detach from window contextual menu item title" ) action:@selector( detachView: ) keyEquivalent:@""] autorelease]; 
    207207        [item setRepresentedObject:self]; 
    208         [item setTarget:[JVChatController defaultManager]]; 
     208        [item setTarget:[JVChatController defaultController]]; 
    209209        [menu addItem:item]; 
    210210 
    …… 
    574574 
    575575                if( user && ! [user isLocalUser] ) 
    576                         [[JVChatController defaultManager] chatViewControllerForUser:user ifExists:NO]; 
     576                        [[JVChatController defaultController] chatViewControllerForUser:user ifExists:NO]; 
    577577 
    578578                [listener ignore]; 
    …… 
    12891289 
    12901290- (void) _startChatWithNonMember:(id) sender { 
    1291         [[JVChatController defaultManager] chatViewControllerForUser:[sender representedObject] ifExists:NO]; 
     1291        [[JVChatController defaultController] chatViewControllerForUser:[sender representedObject] ifExists:NO]; 
    12921292} 
    12931293@end 

  • trunk/JVChatTranscriptPanel.m

    r2595 r2603  
    163163 
    164164- (IBAction) close:(id) sender { 
    165         [[JVChatController defaultManager] disposeViewController:self]; 
     165        [[JVChatController defaultController] disposeViewController:self]; 
    166166} 
    167167 
    …… 
    205205        item = [[[NSMenuItem alloc] initWithTitle:NSLocalizedString( @"Detach From Window", "detach from window contextual menu item title" ) action:@selector( detachView: ) keyEquivalent:@""] autorelease]; 
    206206        [item setRepresentedObject:self]; 
    207         [item setTarget:[JVChatController defaultManager]]; 
     207        [item setTarget:[JVChatController defaultController]]; 
    208208        [menu addItem:item]; 
    209209 
    …… 
    278278- (void) downloadLinkToDisk:(id) sender { 
    279279        NSURL *url = [[sender representedObject] objectForKey:@"WebElementLinkURL"]; 
    280         [[MVFileTransferController defaultManager] downloadFileAtURL:url toLocalFile:nil]; 
     280        [[MVFileTransferController defaultController] downloadFileAtURL:url toLocalFile:nil]; 
    281281} 
    282282 
    …… 
    596596                if( ! [[results lastObject] boolValue] ) { 
    597597                        if( [MVChatConnection supportsURLScheme:[url scheme]] ) { 
    598                                 [[MVConnectionsController defaultManager] handleURL:url andConnectIfPossible:YES]; 
     598                                [[MVConnectionsController defaultController] handleURL:url andConnectIfPossible:YES]; 
    599599                        } else if( [[actionInformation objectForKey:WebActionModifierFlagsKey] unsignedIntValue] & NSAlternateKeyMask ) { 
    600                                 [[MVFileTransferController defaultManager] downloadFileAtURL:url toLocalFile:nil]; 
     600                                [[MVFileTransferController defaultController] downloadFileAtURL:url toLocalFile:nil]; 
    601601                        } else { 
    602602                                if( ( [[actionInformation objectForKey:WebActionModifierFlagsKey] unsignedIntValue] & NSCommandKeyMask ) && [[NSWorkspace sharedWorkspace] respondsToSelector:@selector( openURLs:withAppBundleIdentifier:options:additionalEventParamDescriptor:launchIdentifiers: )] ) { 

  • trunk/JVChatWindowController.m

    r2558 r2603  
    166166 
    167167- (void) close { 
    168         [[JVChatController defaultManager] performSelector:@selector( disposeChatWindowController: ) withObject:self afterDelay:0.]; 
     168        [[JVChatController defaultController] performSelector:@selector( disposeChatWindowController: ) withObject:self afterDelay:0.]; 
    169169        [[self window] orderOut:nil]; 
    170170        [super close]; 
    …… 
    172172 
    173173- (IBAction) closeCurrentPanel:(id) sender { 
    174         [[JVChatController defaultManager] disposeViewController:_activeViewController]; 
     174        [[JVChatController defaultController] disposeViewController:_activeViewController]; 
    175175} 
    176176 
    177177- (IBAction) detachCurrentPanel:(id) sender { 
    178         [[JVChatController defaultManager] detachViewController:_activeViewController]; 
     178        [[JVChatController defaultController] detachViewController:_activeViewController]; 
    179179} 
    180180 

  • trunk/JVConnectionInspector.m

    r2566 r2603  
    6161        [tabView removeTabViewItem:[tabView tabViewItemAtIndex:[tabView indexOfTabViewItemWithIdentifier:@"Proxy"]]]; 
    6262 
    63         [editAutomatic setState:[[MVConnectionsController defaultManager] autoConnectForConnection:_connection]]; 
     63        [editAutomatic setState:[[MVConnectionsController defaultController] autoConnectForConnection:_connection]]; 
    6464        [sslConnection setState:[_connection isSecure]]; 
    6565        [editAddress setObjectValue:[_connection server]]; 
    …… 
    7373        [editUsername setObjectValue:[_connection username]]; 
    7474 
    75         NSString *commands = [[MVConnectionsController defaultManager] connectCommandsForConnection:_connection]; 
     75        NSString *commands = [[MVConnectionsController defaultController] connectCommandsForConnection:_connection]; 
    7676        if( commands) [connectCommands setString:commands]; 
    7777 
    7878        [_editingRooms autorelease]; 
    79         _editingRooms = [[NSMutableArray arrayWithArray:[[MVConnectionsController defaultManager] joinRoomsForConnection:_connection]] retain]; 
     79        _editingRooms = [[NSMutableArray arrayWithArray:[[MVConnectionsController defaultController] joinRoomsForConnection:_connection]] retain]; 
    8080 
    8181        [editRooms reloadData]; 
    …… 
    9191        [editRules setDoubleAction:@selector( configureRule: )]; 
    9292 
    93         _ignoreRules = [[MVConnectionsController defaultManager] ignoreRulesForConnection:_connection]; 
     93        _ignoreRules = [[MVConnectionsController defaultController] ignoreRulesForConnection:_connection]; 
    9494} 
    9595 
    9696- (void) didUnload { 
    97         [[MVConnectionsController defaultManager] setJoinRooms:_editingRooms forConnection:_connection]; 
    98         [[MVConnectionsController defaultManager] setConnectCommands:[connectCommands string] forConnection:_connection]; 
     97        [[MVConnectionsController defaultController] setJoinRooms:_editingRooms forConnection:_connection]; 
     98        [[MVConnectionsController defaultController] setConnectCommands:[connectCommands string] forConnection:_connection]; 
    9999} 
    100100 
    …… 
    172172 
    173173- (IBAction) toggleAutoConnect:(id) sender { 
    174         [[MVConnectionsController defaultManager] setAutoConnect:[sender state] forConnection:_connection]; 
     174        [[MVConnectionsController defaultController] setAutoConnect:[sender state] forConnection:_connection]; 
    175175} 
    176176 

  • trunk/JVDirectChatPanel.m

    r2600 r2603  
    268268        [send setRichText:YES]; 
    269269        [send setImportsGraphics:NO]; 
    270         [send setUsesFindPanel:NO]; 
    271270        [send setUsesFontPanel:YES]; 
    272271        [send setAllowsUndo:YES]; 
    …… 
    396395        item = [[[NSMenuItem alloc] initWithTitle:NSLocalizedString( @"Detach From Window", "detach from window contextual menu item title" ) action:@selector( detachView: ) keyEquivalent:@""] autorelease]; 
    397396        [item setRepresentedObject:self]; 
    398         [item setTarget:[JVChatController defaultManager]]; 
     397        [item setTarget:[JVChatController defaultController]]; 
    399398        [menu addItem:item]; 
    400399 
    …… 
    669668 
    670669        if( ! [user isLocalUser] ) 
    671                 [cmessage setIgnoreStatus:[[JVChatController defaultManager] shouldIgnoreUser:user withMessage:messageString inView:self]]; 
     670                [cmessage setIgnoreStatus:[[JVChatController defaultController] shouldIgnoreUser:user withMessage:messageString inView:self]]; 
    672671 
    673672        if( ! [user isLocalUser] && [cmessage ignoreStatus] == JVNotIgnored ) 
    …… 
    10551054        if( [event modifierFlags] & ~( NSFunctionKeyMask | NSNumericPadKeyMask | NSAlphaShiftKeyMask | NSAlternateKeyMask | 0xffff ) ) return NO; 
    10561055 
    1057         BOOL usesOnlyArrows = [[NSUserDefaults standardUserDefaults] boolForKey:@"JVSendHistoryUsesOnlyArrows"]; 
    1058  
    1059         if( chr == NSUpArrowFunctionKey && ( usesOnlyArrows || [event modifierFlags] & NSAlternateKeyMask ) ) { 
     1056        if( chr == NSUpArrowFunctionKey && [event modifierFlags] & NSAlternateKeyMask ) { 
    10601057                return [self upArrowKeyPressed]; 
    1061         } else if( chr == NSDownArrowFunctionKey && ( usesOnlyArrows || [event modifierFlags] & NSAlternateKeyMask ) ) { 
     1058        } else if( chr == NSDownArrowFunctionKey && [event modifierFlags] & NSAlternateKeyMask ) { 
    10621059                return [self downArrowKeyPressed]; 
    10631060        } else if( chr == NSPageUpFunctionKey || chr == NSPageDownFunctionKey || chr == NSHomeFunctionKey || chr == NSBeginFunctionKey || chr == NSEndFunctionKey ) { 
    …… 
    16761673                passive = [passiveButton state]; 
    16771674                while( ( path = [enumerator nextObject] ) ) 
    1678                         [[MVFileTransferController defaultManager] addFileTransfer:[[self target] sendFile:path passively:passive]]; 
     1675                        [[MVFileTransferController defaultController] addFileTransfer:[[self target] sendFile:path passively:passive]]; 
    16791676        } 
    16801677} 

  • trunk/JVSmartTranscriptPanel.m

    r2595 r2603  
    130130        item = [[[NSMenuItem alloc] initWithTitle:NSLocalizedString( @"Detach From Window", "detach from window contextual menu item title" ) action:@selector( detachView: ) keyEquivalent:@""] autorelease]; 
    131131        [item setRepresentedObject:self]; 
    132         [item setTarget:[JVChatController defaultManager]]; 
     132        [item setTarget:[JVChatController defaultController]]; 
    133133        [menu addItem:item]; 
    134134 
    …… 
    167167 
    168168- (IBAction) dispose:(id) sender { 
    169         [[JVChatController defaultManager] disposeSmartTranscript:self]; 
     169        [[JVChatController defaultController] disposeSmartTranscript:self]; 
    170170} 
    171171 
    …… 
    273273        [_windowController reloadListItem:self andChildren:NO]; 
    274274 
    275         [[JVChatController defaultManager] saveSmartTranscripts]; 
     275        [[JVChatController defaultController] saveSmartTranscripts]; 
    276276} 
    277277 

  • trunk/JVTabbedChatWindowController.m

    r2601 r2603  
    211211 
    212212- (void) customTabView:(AICustomTabsView *) view closeTabViewItem:(NSTabViewItem *) tabViewItem { 
    213         [[JVChatController defaultManager] disposeViewController:[(JVChatTabItem *)tabViewItem chatViewController]]; 
     213        [[JVChatController defaultController] disposeViewController:[(JVChatTabItem *)tabViewItem chatViewController]]; 
    214214} 
    215215 
    …… 
    222222                if( ! newWindowController ) { 
    223223                        NSRect newFrame; 
    224                         newWindowController = [[JVChatController defaultManager] newChatWindowController]; 
     224                        newWindowController = [[JVChatController defaultController] newChatWindowController]; 
    225225                        newFrame.origin = screenPoint; 
    226226                        newFrame.size = [[oldWindowController window] frame].size; 

  • trunk/MVApplicationController.m

    r2602 r2603  
    5353 
    5454- (IBAction) connectToSupportRoom:(id) sender { 
    55         [[MVConnectionsController defaultManager] handleURL:[NSURL URLWithString:@"irc://irc.freenode.net/#colloquy"] andConnectIfPossible:YES]; 
     55        [[MVConnectionsController defaultController] handleURL:[NSURL URLWithString:@"irc://irc.freenode.net/#colloquy"] andConnectIfPossible:YES]; 
    5656} 
    5757 
    …… 
    7777 
    7878- (IBAction) showTransferManager:(id) sender { 
    79         if( [[[MVFileTransferController defaultManager] window] isKeyWindow] ) 
    80                 [[MVFileTransferController defaultManager] hideTransferManager:nil]; 
    81         else [[MVFileTransferController defaultManager] showTransferManager:nil]; 
     79        if( [[[MVFileTransferController defaultController] window] isKeyWindow] ) 
     80                [[MVFileTransferController defaultController] hideTransferManager:nil]; 
     81        else [[MVFileTransferController defaultController] showTransferManager:nil]; 
    8282} 
    8383 
    8484- (IBAction) showConnectionManager:(id) sender { 
    85         if( [[[MVConnectionsController defaultManager] window] isKeyWindow] ) 
    86                 [[MVConnectionsController defaultManager] hideConnectionManager:nil]; 
    87         else [[MVConnectionsController defaultManager] showConnectionManager:nil]; 
     85        if( [[[MVConnectionsController defaultController] window] isKeyWindow] ) 
     86                [[MVConnectionsController defaultController] hideConnectionManager:nil]; 
     87        else [[MVConnectionsController defaultController] showConnectionManager:nil]; 
    8888} 
    8989 
    …… 
    111111        NSDictionary *attributes = [[NSFileManager defaultManager] fileAttributesAtPath:filename traverseLink:YES]; 
    112112        if( returnCode == NSOKButton && [[NSFileManager defaultManager] isReadableFileAtPath:filename] && ( [[filename pathExtension] caseInsensitiveCompare:@"colloquyTranscript"] == NSOrderedSame || ( [[attributes objectForKey:NSFileHFSTypeCode] unsignedLongValue] == 'coTr' && [[attributes objectForKey:NSFileHFSCreatorCode] unsignedLongValue] == 'coRC' ) ) ) { 
    113                 [[JVChatController defaultManager] chatViewControllerForTranscript:filename]; 
     113                [[JVChatController defaultController] chatViewControllerForTranscript:filename]; 
    114114        } 
    115115} 
    …… 
    118118 
    119119- (JVChatController *) chatController { 
    120         return [JVChatController defaultManager]; 
     120        return [JVChatController defaultController]; 
    121121} 
    122122 
    123123- (MVConnectionsController *) connectionsController { 
    124         return [MVConnectionsController defaultManager]; 
     124        return [MVConnectionsController defaultController]; 
    125125} 
    126126 
    127127- (MVFileTransferController *) transferManager { 
    128         return [MVFileTransferController defaultManager]; 
     128        return [MVFileTransferController defaultController]; 
    129129} 
    130130 
    …… 
    136136 
    137137- (IBAction) newConnection:(id) sender { 
    138         [[MVConnectionsController defaultManager] newConnection:nil]; 
     138        [[MVConnectionsController defaultController] newConnection:nil]; 
    139139} 
    140140 
    …… 
    178178 
    179179- (IBAction) markAllDisplays:(id) sender { 
    180         JVChatController *chatController = [JVChatController defaultManager]; 
     180        JVChatController *chatController = [JVChatController defaultController]; 
    181181        Class controllerClass = [JVDirectChatPanel class]; 
    182182        NSSet *viewControllers = [chatController chatViewControllersKindOfClass:controllerClass]; 
    …… 
    208208        NSDictionary *attributes = [[NSFileManager defaultManager] fileAttributesAtPath:filename traverseLink:YES]; 
    209209        if( [[NSFileManager defaultManager] isReadableFileAtPath:filename] && ( [[filename pathExtension] caseInsensitiveCompare:@"colloquyTranscript"] == NSOrderedSame || ( [[attributes objectForKey:NSFileHFSTypeCode] unsignedLongValue] == 'coTr' && [[attributes objectForKey:NSFileHFSCreatorCode] unsignedLongValue] == 'coRC' ) ) ) { 
    210                 [[JVChatController defaultManager] chatViewControllerForTranscript:filename]; 
     210                [[JVChatController defaultController] chatViewControllerForTranscript:filename]; 
    211211                return YES; 
    212212        } else if( [[NSWorkspace sharedWorkspace] isFilePackageAtPath:filename] && ( [[filename pathExtension] caseInsensitiveCompare:@"colloquyStyle"] == NSOrderedSame || [[filename pathExtension] caseInsensitiveCompare:@"fireStyle"] == NSOrderedSame || ( [[attributes objectForKey:NSFileHFSTypeCode] unsignedLongValue] == 'coSt' && [[attributes objectForKey:NSFileHFSCreatorCode] unsignedLongValue] == 'coRC' ) ) ) { 
    …… 
    270270- (void) handleURLEvent:(NSAppleEventDescriptor *) event withReplyEvent:(NSAppleEventDescriptor *) replyEvent { 
    271271        NSURL *url = [NSURL URLWithString:[[event descriptorAtIndex:1] stringValue]]; 
    272         if( [MVChatConnection supportsURLScheme:[url scheme]] ) [[MVConnectionsController defaultManager] handleURL:url andConnectIfPossible:YES]; 
     272        if( [MVChatConnection supportsURLScheme:[url scheme]] ) [[MVConnectionsController defaultController] handleURL:url andConnectIfPossible:YES]; 
    273273        else [[NSWorkspace sharedWorkspace] openURL:url]; 
    274274} 
    …… 
    379379 
    380380        [MVChatPluginManager defaultManager]; 
    381         [MVConnectionsController defaultManager]; 
    382         [JVChatController defaultManager]; 
    383         [MVFileTransferController defaultManager]; 
     381        [MVConnectionsController defaultController]; 
     382        [JVChatController defaultController]; 
     383        [MVFileTransferController defaultController]; 
    384384        [MVBuddyListController sharedBuddyList]; 
    385385 
    …… 
    434434- (BOOL) validateMenuItem:(NSMenuItem *) menuItem { 
    435435        if( [menuItem action] == @selector( joinRoom: ) ) { 
    436                 if( [[[MVConnectionsController defaultManager] connections] count] ) { 
     436                if( [[[MVConnectionsController defaultController] connections] count] ) { 
    437437                        return YES; 
    438438                } else { 
    …… 
    440440                } 
    441441        } else if( [menuItem action] == @selector( markAllDisplays: ) ) { 
    442                 JVChatController *chatController = [JVChatController defaultManager]; 
     442                JVChatController *chatController = [JVChatController defaultController]; 
    443443                Class controllerClass = [JVDirectChatPanel class]; 
    444444                NSSet *viewControllers = [chatController chatViewControllersKindOfClass:controllerClass]; 

  • trunk/MVBuddyListController.m

    r2564 r2603  
    240240        _addPerson = nil; 
    241241 
    242         NSEnumerator *enumerator = [[[MVConnectionsController defaultManager] connections] objectEnumerator]; 
     242        NSEnumerator *enumerator = [[[MVConnectionsController defaultController] connections] objectEnumerator]; 
    243243        MVChatConnection *connection = nil; 
    244244        NSMenu *menu = [[[NSMenu alloc] initWithTitle:@""] autorelease]; 
    …… 
    434434        MVChatUser *user = [buddy activeUser]; 
    435435        if( [user type] != MVChatRemoteUserType ) return; 
    436         [[JVChatController defaultManager] chatViewControllerForUser:user ifExists:NO]; 
     436        [[JVChatController defaultController] chatViewControllerForUser:user ifExists:NO]; 
    437437} 
    438438 
    …… 
    472472                NSString *path = nil; 
    473473                while( ( path = [enumerator nextObject] ) ) 
    474                         [[MVFileTransferController defaultManager] addFileTransfer:[user sendFile:path passively:passive]]; 
     474                        [[MVFileTransferController defaultController] addFileTransfer:[user sendFile:path passively:passive]]; 
    475475        } 
    476476} 
    …… 
    821821 
    822822                while( ( file = [enumerator nextObject] ) ) 
    823                         [[MVFileTransferController defaultManager] addFileTransfer:[user sendFile:file passively:passive]]; 
     823                        [[MVFileTransferController defaultController] addFileTransfer:[user sendFile:file passively:passive]]; 
    824824 
    825825                return YES; 

  • trunk/MVConnectionsController.h

    r2558 r2603  
    5757        NSMutableSet *_publicKeyRequestQueue; 
    5858} 
    59 + (MVConnectionsController *) defaultManager; 
     59+ (MVConnectionsController *) defaultController; 
    6060 
    6161+ (NSMenu *) favoritesMenu; 

  • trunk/MVConnectionsController.m

    r2558 r2603  
    5050 
    5151@implementation MVConnectionsController 
    52 + (MVConnectionsController *) defaultManager { 
     52+ (MVConnectionsController *) defaultController { 
    5353        extern MVConnectionsController *sharedInstance; 
    5454        return ( sharedInstance ? sharedInstance : ( sharedInstance = [[self alloc] initWithWindowNibName:nil] ) ); 
    …… 
    388388 
    389389        if( [[NSUserDefaults standardUserDefaults] boolForKey:@"JVChatOpenConsoleOnConnect"] ) 
    390                 [[JVChatController defaultManager] chatConsoleForConnection:connection ifExists:NO]; 
     390                [[JVChatController defaultController] chatConsoleForConnection:connection ifExists:NO]; 
    391391 
    392392        [connection connectToServer:[newAddress stringValue] onPort:[newPort intValue] asUser:[newNickname stringValue]]; 
    …… 
    408408        if( [sender tag] ) { 
    409409                MVChatUser *user = [[[_bookmarks objectAtIndex:[connections selectedRow]] objectForKey:@"connection"] chatUserWithUniqueIdentifier:[userToMessage stringValue]]; 
    410                 [[JVChatController defaultManager] chatViewControllerForUser:user ifExists:NO]; 
     410                [[JVChatController defaultController] chatViewControllerForUser:user ifExists:NO]; 
    411411        } 
    412412} 
    …… 
    655655                                if( ! [connection isConnected] && connect ) { 
    656656                                        if( [[NSUserDefaults standardUserDefaults] boolForKey:@"JVChatOpenConsoleOnConnect"] ) 
    657                                                 [[JVChatController defaultManager] chatConsoleForConnection:connection ifExists:NO]; 
     657                                                [[JVChatController defaultController] chatConsoleForConnection:connection ifExists:NO]; 
    658658                                        [connection connect]; 
    659659                                } 
    …… 
    686686                        if( connect ) { 
    687687                                if( [[NSUserDefaults standardUserDefaults] boolForKey:@"JVChatOpenConsoleOnConnect"] ) 
    688                                         [[JVChatController defaultManager] chatConsoleForConnection:connection ifExists:NO]; 
     688                                        [[JVChatController defaultController] chatConsoleForConnection:connection ifExists:NO]; 
    689689                                if( target ) [_joinRooms addObject:target]; 
    690690 
    …… 
    13731373                        case MVChatBadTargetError: 
    13741374                                if( [target hasPrefix:@"#"] || [target hasPrefix:@"&"] || [target hasPrefix:@"+"] || [target hasPrefix:@"!"] ) { 
    1375                                         [(JVChatRoomPanel *)[[JVChatController defaultManager] chatViewControllerForRoom:target withConnection:connection ifExists:YES] unavailable]; 
     1375                                        [(JVChatRoomPanel *)[[JVChatController defaultController] chatViewControllerForRoom:target withConnection:connection ifExists:YES] unavailable]; 
    13761376                                } else if( target ) { 
    1377                                         [(JVDirectChatPanel *)[[JVChatController defaultManager] chatViewControllerForUser:target withConnection:connection ifExists:YES] unavailable]; 
     1377                                        [(JVDirectChatPanel *)[[JVChatController defaultController] chatViewControllerForUser:target withConnection:connection ifExists:YES] unavailable]; 
    13781378                                } else { 
    13791379                                        NSRunCriticalAlertPanel( NSLocalizedString( @"Your Chat nickname could not be used", "chat invalid nickname dialog title" ), NSLocalizedString( @"The nickname you specified is in use or invalid on this server.", "chat invalid nickname dialog message" ), nil, nil, nil ); 
    …… 
    14871487                if( [[info objectForKey:@"automatic"] boolValue] && ! ( [[[NSApplication sharedApplication] currentEvent] modifierFlags] & NSShiftKeyMask ) ) { 
    14881488                        if( [[NSUserDefaults standardUserDefaults] boolForKey:@"JVChatOpenConsoleOnConnect"] ) 
    1489                                 [[JVChatController defaultManager] chatConsoleForConnection:connection ifExists:NO]; 
     1489                                [[JVChatController defaultController] chatConsoleForConnection:connection ifExists:NO]; 
    14901490 
    14911491                        [connection setPassword:[[MVKeyChain defaultKeyChain] internetPasswordForServer:[connection server] securityDomain:[connection server] account:nil path:nil port:[connection serverPort] protocol:MVKeyChainProtocolIRC authenticationType:MVKeyChainAuthenticationTypeDefault]]; 
    …… 
    16481648        [connection setPassword:[[MVKeyChain defaultKeyChain] internetPasswordForServer:[connection server] securityDomain:[connection server] account:nil path:nil port:[connection serverPort] protocol:MVKeyChainProtocolIRC authenticationType:MVKeyChainAuthenticationTypeDefault]]; 
    16491649        if( [[NSUserDefaults standardUserDefaults] boolForKey:@"JVChatOpenConsoleOnConnect"] ) 
    1650                 [[JVChatController defaultManager] chatConsoleForConnection:connection ifExists:NO]; 
     1650                [[JVChatController defaultController] chatConsoleForConnection:connection ifExists:NO]; 
    16511651        [connection connect]; 
    16521652} 
    …… 
    16551655        MVChatConnection *connection = [notification object]; 
    16561656        if( [[NSUserDefaults standardUserDefaults] boolForKey:@"JVChatOpenConsoleOnConnect"] ) 
    1657                 [[JVChatController defaultManager] chatConsoleForConnection:connection ifExists:NO]; 
     1657                [[JVChatController defaultController] chatConsoleForConnection:connection ifExists:NO]; 
    16581658} 
    16591659 
    …… 
    17451745        unsigned int row = [connections selectedRow]; 
    17461746        if( row == -1 ) return; 
    1747         [[JVChatController defaultManager] chatConsoleForConnection:[[_bookmarks objectAtIndex:row] objectForKey:@"connection"] ifExists:NO]; 
     1747        [[JVChatController defaultController] chatConsoleForConnection:[[_bookmarks objectAtIndex:row] objectForKey:@"connection"] ifExists:NO]; 
    17481748} 
    17491749 
    …… 
    17541754+ (IBAction) _connectToFavorite:(id) sender { 
    17551755        if( ! [sender representedObject] ) return; 
    1756         [[MVConnectionsController defaultManager] handleURL:[sender representedObject] andConnectIfPossible:YES]; 
     1756        [[MVConnectionsController defaultController] handleURL:[sender representedObject] andConnectIfPossible:YES]; 
    17571757} 
    17581758@end 
    …… 
    17721772@implementation NSApplication (MVConnectionsControllerScripting) 
    17731773- (void) newConnection:(NSScriptCommand *) command { 
    1774         [[MVConnectionsController defaultManager] newConnection:nil]; 
     1774        [[MVConnectionsController defaultController] newConnection:nil]; 
    17751775} 
    17761776 
    …… 
    17781778 
    17791779- (NSArray *) chatConnections { 
    1780         return [[MVConnectionsController defaultManager] connections]; 
     1780        return [[MVConnectionsController defaultController] connections]; 
    17811781} 
    17821782 
    …… 
    17981798 
    17991799- (void) addInChatConnections:(MVChatConnection *) connection { 
    1800         [[MVConnectionsController defaultManager] addConnection:connection]; 
     1800        [[MVConnectionsController defaultController] addConnection:connection]; 
    18011801}