Permalink
Browse files

merge SPTableContent (part of #2789)

  • Loading branch information...
dmoagx committed Dec 28, 2017
1 parent d0bf2ec commit 69cc436627f16434b8c72bd6b115cd39769ff38f
View
@@ -4012,7 +4012,7 @@ - (void)awakeFromNib
*/
- (id)_resultDataItemAtRow:(NSInteger)row columnIndex:(NSUInteger)column preserveNULLs:(BOOL)preserveNULLs asPreview:(BOOL)asPreview;
{
#warning duplicate code with SPTableContentDataSource.m tableView:objectValueForTableColumn:…
#warning duplicate code with SPTableContent.m tableView:objectValueForTableColumn:…
id value = nil;
// While the table is being loaded, additional validation is required - data
@@ -36,7 +36,6 @@
#import "SPFileHandle.h"
#import "SPKeychain.h"
#import "SPTableContent.h"
#import "SPTableContentFilter.h"
#import "SPCustomQuery.h"
#import "SPDataImport.h"
#import "ImageAndTextCell.h"
@@ -35,7 +35,6 @@
#import "SPDatabaseDocument.h"
#import "SPCustomQuery.h"
#import "SPTableContent.h"
#import "SPTableContentDelegate.h"
#import "SPExportController+SharedPrivateAPI.h"
#import <SPMySQL/SPMySQL.h>
View
@@ -52,7 +52,7 @@
#import "SPDatabaseContentViewDelegate.h"
@interface SPTableContent : NSObject <NSTableViewDelegate, NSTableViewDataSource, NSComboBoxDataSource, NSComboBoxDelegate>
@interface SPTableContent : NSObject <NSTableViewDelegate, NSTableViewDataSource, NSComboBoxDataSource, NSComboBoxDelegate, SPDatabaseContentViewDelegate>
{
IBOutlet SPDatabaseDocument *tableDocumentInstance;
IBOutlet id tablesListInstance;
@@ -309,4 +309,14 @@
- (NSArray *)fieldEditStatusForRow:(NSInteger)rowIndex andColumn:(NSInteger)columnIndex;
#pragma mark - SPTableContentDataSource
- (BOOL)cellValueIsDisplayedAsHexForColumn:(NSUInteger)columnIndex;
#pragma mark - SPTableContentFilter
- (void)makeContentFilterHaveFocus;
- (void)updateFilterTableClause:(id)currentValue;
- (NSString*)escapeFilterTableDefaultOperator:(NSString*)op;
@end
Oops, something went wrong.

0 comments on commit 69cc436

Please sign in to comment.