Skip to content

Commit 69cc436

Browse files
committed
merge SPTableContent (part of #2789)
1 parent d0bf2ec commit 69cc436

12 files changed

+1213
-1485
lines changed

Source/SPCustomQuery.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4012,7 +4012,7 @@ - (void)awakeFromNib
40124012
*/
40134013
- (id)_resultDataItemAtRow:(NSInteger)row columnIndex:(NSUInteger)column preserveNULLs:(BOOL)preserveNULLs asPreview:(BOOL)asPreview;
40144014
{
4015-
#warning duplicate code with SPTableContentDataSource.m tableView:objectValueForTableColumn:…
4015+
#warning duplicate code with SPTableContent.m tableView:objectValueForTableColumn:…
40164016
id value = nil;
40174017

40184018
// While the table is being loaded, additional validation is required - data

Source/SPDatabaseDocument.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#import "SPFileHandle.h"
3737
#import "SPKeychain.h"
3838
#import "SPTableContent.h"
39-
#import "SPTableContentFilter.h"
4039
#import "SPCustomQuery.h"
4140
#import "SPDataImport.h"
4241
#import "ImageAndTextCell.h"

Source/SPExportFileUtilities.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
#import "SPDatabaseDocument.h"
3636
#import "SPCustomQuery.h"
3737
#import "SPTableContent.h"
38-
#import "SPTableContentDelegate.h"
3938
#import "SPExportController+SharedPrivateAPI.h"
4039

4140
#import <SPMySQL/SPMySQL.h>

Source/SPTableContent.h

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
#import "SPDatabaseContentViewDelegate.h"
5454

55-
@interface SPTableContent : NSObject <NSTableViewDelegate, NSTableViewDataSource, NSComboBoxDataSource, NSComboBoxDelegate>
55+
@interface SPTableContent : NSObject <NSTableViewDelegate, NSTableViewDataSource, NSComboBoxDataSource, NSComboBoxDelegate, SPDatabaseContentViewDelegate>
5656
{
5757
IBOutlet SPDatabaseDocument *tableDocumentInstance;
5858
IBOutlet id tablesListInstance;
@@ -309,4 +309,14 @@
309309

310310
- (NSArray *)fieldEditStatusForRow:(NSInteger)rowIndex andColumn:(NSInteger)columnIndex;
311311

312+
#pragma mark - SPTableContentDataSource
313+
314+
- (BOOL)cellValueIsDisplayedAsHexForColumn:(NSUInteger)columnIndex;
315+
316+
#pragma mark - SPTableContentFilter
317+
318+
- (void)makeContentFilterHaveFocus;
319+
- (void)updateFilterTableClause:(id)currentValue;
320+
- (NSString*)escapeFilterTableDefaultOperator:(NSString*)op;
321+
312322
@end

0 commit comments

Comments
 (0)