Skip to content

Commit 0b09642

Browse files
committed
merge some smaller classes (part of #2789)
1 parent 8b221ee commit 0b09642

14 files changed

+124
-283
lines changed

Source/SPCharsetCollationHelper.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#import "SPServerSupport.h"
3434
#import "SPDatabaseData.h"
3535

36-
@interface SPCharsetCollationHelper (Hidden)
36+
@interface SPCharsetCollationHelper ()
3737

3838
- (void)charsetButtonClicked:(id)sender;
3939
- (void)collationButtonClicked:(id)sender;

Source/SPContentFilterManager.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@
3131
@class SPDatabaseDocument;
3232
@class SPSplitView;
3333

34-
@interface NSObject (SPContentFilterManagerDelegate)
35-
36-
- (void)contentFiltersHaveBeenUpdated:(id)manager;
37-
38-
@end
39-
4034
@interface SPContentFilterManager : NSWindowController <NSOpenSavePanelDelegate>
4135
{
4236
#ifndef SP_CODA /* ivars */

Source/SPFieldEditorController.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,3 +254,10 @@
254254
- (void)setDoGroupDueToChars;
255255

256256
@end
257+
258+
@protocol SPFieldEditorControllerDelegate <NSObject>
259+
260+
@optional
261+
- (void)processFieldEditorResult:(id)data contextInfo:(NSDictionary*)contextInfo;
262+
263+
@end

Source/SPFieldEditorController.m

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@
4747
HexSegment
4848
} FieldEditorSegment;
4949

50-
@interface SPFieldEditorController (SPFieldEditorControllerDelegate)
51-
52-
- (void)processFieldEditorResult:(id)data contextInfo:(NSDictionary*)contextInfo;
53-
54-
@end
55-
5650
@implementation SPFieldEditorController
5751

5852
@synthesize editedFieldInfo;
@@ -672,7 +666,9 @@ - (IBAction)closeEditSheet:(id)sender
672666
else if ( [callerInstance isKindOfClass:[SPTableContent class]] )
673667
[(SPTableContent*)callerInstance processFieldEditorResult:returnData contextInfo:contextInfo];
674668
#else
675-
[callerInstance processFieldEditorResult:returnData contextInfo:contextInfo];
669+
if([callerInstance respondsToSelector:@selector(processFieldEditorResult:contextInfo:)]) {
670+
[(id <SPFieldEditorControllerDelegate>)callerInstance processFieldEditorResult:returnData contextInfo:contextInfo];
671+
}
676672
#endif
677673
}
678674
}

Source/SPGotoDatabaseController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
#import "SPGotoDatabaseController.h"
3232

33-
@interface SPGotoDatabaseController (Private)
33+
@interface SPGotoDatabaseController ()
3434

3535
/** Update the list of matched names
3636
* @param filter The string to be matched.

Source/SPQueryFavoriteManager.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,7 @@ - (IBAction)closeQueryManagerSheet:(id)sender
477477
[prefs setObject:[self queryFavoritesForFileURL:nil] forKey:SPQueryFavorites];
478478

479479
// Inform all opened documents to update the query favorites list
480+
#warning This should be done using notifications
480481
for(id doc in [SPAppDelegate orderedDocuments])
481482
if([[doc valueForKeyPath:@"customQueryInstance"] respondsToSelector:@selector(queryFavoritesHaveBeenUpdated:)])
482483
[[doc valueForKeyPath:@"customQueryInstance"] queryFavoritesHaveBeenUpdated:self];

Source/SPTableInfo.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#import "SPTableTextFieldCell.h"
3838
#import "SPAppController.h"
3939

40-
@interface SPTableInfo (PrivateAPI)
40+
@interface SPTableInfo ()
4141

4242
- (NSString *)_getUserDefinedDateStringFromMySQLDate:(NSString *)mysqlDate;
4343

Source/SPTableRelations.m

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,57 @@ - (BOOL)validateMenuItem:(NSMenuItem *)menuItem
540540
return YES;
541541
}
542542

543+
#pragma mark -
544+
#pragma mark TextField delegate methods
545+
546+
- (void)controlTextDidChange:(NSNotification *)notification
547+
{
548+
// Make sure the user does not enter a taken name, using the quickly-generated incomplete list
549+
if ([notification object] == constraintName) {
550+
NSString *userValue = [[constraintName stringValue] lowercaseString];
551+
552+
// Make field red and disable add button
553+
if ([takenConstraintNames containsObject:userValue]) {
554+
[constraintName setTextColor:[NSColor redColor]];
555+
[confirmAddRelationButton setEnabled:NO];
556+
}
557+
else {
558+
[constraintName setTextColor:[NSColor controlTextColor]];
559+
[confirmAddRelationButton setEnabled:YES];
560+
}
561+
}
562+
}
563+
564+
#pragma mark -
565+
#pragma mark Tableview delegate methods
566+
567+
/**
568+
* Called whenever the relations table view selection changes.
569+
*/
570+
- (void)tableViewSelectionDidChange:(NSNotification *)notification
571+
{
572+
[removeRelationButton setEnabled:([relationsTableView numberOfSelectedRows] > 0)];
573+
}
574+
575+
/*
576+
* Double-click action on table cells - for the time being, return
577+
* NO to disable editing.
578+
*/
579+
- (BOOL)tableView:(NSTableView *)tableView shouldEditTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)rowIndex
580+
{
581+
if ([tableDocumentInstance isWorking]) return NO;
582+
583+
return NO;
584+
}
585+
586+
/**
587+
* Disable row selection while the document is working.
588+
*/
589+
- (BOOL)tableView:(NSTableView *)tableView shouldSelectRow:(NSInteger)rowIndex
590+
{
591+
return ![tableDocumentInstance isWorking];
592+
}
593+
543594
#pragma mark -
544595
#pragma mark Private API
545596

Source/SPTableRelationsDelegate.h

Lines changed: 0 additions & 35 deletions
This file was deleted.

Source/SPTableRelationsDelegate.m

Lines changed: 0 additions & 87 deletions
This file was deleted.

Source/SPTableTriggers.m

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -656,6 +656,65 @@ - (void)_removePreferenceObservers
656656
[prefs removeObserver:self forKeyPath:SPDisplayTableViewVerticalGridlines];
657657
}
658658

659+
#pragma mark -
660+
#pragma mark Tableview delegate methods
661+
662+
/**
663+
* Called whenever the triggers table view selection changes.
664+
*/
665+
- (void)tableViewSelectionDidChange:(NSNotification *)notification
666+
{
667+
[removeTriggerButton setEnabled:([triggersTableView numberOfSelectedRows] > 0)];
668+
}
669+
670+
/**
671+
* Alter the colour of cells displaying NULL values
672+
*/
673+
- (void)tableView:(NSTableView *)tableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)rowIndex
674+
{
675+
if (![cell respondsToSelector:@selector(setTextColor:)]) {
676+
return;
677+
}
678+
679+
id value = [[triggerData objectAtIndex:rowIndex] objectForKey:[tableColumn identifier]];
680+
681+
[cell setTextColor:[value isNSNull] ? [NSColor lightGrayColor] : [NSColor blackColor]];
682+
}
683+
684+
/**
685+
* Double-click action on table cells - for the time being, return NO to disable editing.
686+
*/
687+
- (BOOL)tableView:(NSTableView *)tableView shouldEditTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)rowIndex
688+
{
689+
if ([tableDocumentInstance isWorking]) return NO;
690+
691+
// Start Edit panel
692+
if (((NSInteger)[triggerData count] > rowIndex) && [triggerData objectAtIndex:rowIndex]) {
693+
[self _editTriggerAtIndex:rowIndex];
694+
}
695+
696+
return NO;
697+
}
698+
699+
/**
700+
* Disable row selection while the document is working.
701+
*/
702+
- (BOOL)tableView:(NSTableView *)tableView shouldSelectRow:(NSInteger)rowIndex
703+
{
704+
return (![tableDocumentInstance isWorking]);
705+
}
706+
707+
#pragma mark -
708+
#pragma mark Textfield delegate methods
709+
710+
/**
711+
* Toggles the enabled state of confirm add trigger button based on the editing of the trigger's name.
712+
*/
713+
- (void)controlTextDidChange:(NSNotification *)notification
714+
{
715+
[self _toggleConfirmAddTriggerButtonEnabled];
716+
}
717+
659718
#pragma mark -
660719

661720
- (void)dealloc

Source/SPTableTriggersDelegate.h

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)