5656#import " SPThreadAdditions.h"
5757#import " SPTableFilterParser.h"
5858#import " SPFunctions.h"
59- #import " SPTableContentFilterController .h"
59+ #import " SPRuleFilterController .h"
6060#import " SPFilterTableController.h"
6161
6262#import < pthread.h>
@@ -235,20 +235,20 @@ - (void)awakeFromNib
235235 // Add observer to change view sizes with filter rule editor
236236 [[NSNotificationCenter defaultCenter ] addObserver: self
237237 selector: @selector (filterRuleEditorPreferredSizeChanged: )
238- name: SPTableContentFilterHeightChangedNotification
239- object: filterControllerInstance ];
238+ name: SPRuleFilterHeightChangedNotification
239+ object: ruleFilterController ];
240240 [contentAreaContainer setPostsFrameChangedNotifications: YES ];
241241 [[NSNotificationCenter defaultCenter ] addObserver: self
242242 selector: @selector (contentViewSizeChanged: )
243243 name: NSViewFrameDidChangeNotification
244244 object: contentAreaContainer];
245- [filterControllerInstance setTarget: self ];
246- [filterControllerInstance setAction: @selector (filterTable: )];
245+ [ruleFilterController setTarget: self ];
246+ [ruleFilterController setAction: @selector (filterTable: )];
247247
248248 [filterTableController setTarget: self ];
249249 [filterTableController setAction: @selector (filterTable: )];
250250 // TODO This is only needed for 10.6 compatibility
251- scrollViewHasRubberbandScrolling = [[[filterControllerInstance view ] enclosingScrollView ] respondsToSelector: @selector (setVerticalScrollElasticity: )];
251+ scrollViewHasRubberbandScrolling = [[[ruleFilterController view ] enclosingScrollView ] respondsToSelector: @selector (setVerticalScrollElasticity: )];
252252
253253 // Add observers for document task activity
254254 [[NSNotificationCenter defaultCenter ] addObserver: self
@@ -362,7 +362,7 @@ - (void)_setViewBlankState
362362 [self setRuleEditorVisible: NO animate: NO ];
363363 [toggleRuleFilterButton setEnabled: NO ];
364364 [toggleRuleFilterButton setState: NSOffState ];
365- [filterControllerInstance setColumns: nil ];
365+ [ruleFilterController setColumns: nil ];
366366
367367 // Disable pagination
368368 [paginationPreviousButton setEnabled: NO ];
@@ -634,9 +634,9 @@ - (void) setTableDetails:(NSDictionary *)tableDetails
634634
635635 [filterTableController setColumns: dataColumns];
636636 // Enable and initialize filter fields (with tags for position of menu item and field position)
637- [filterControllerInstance setColumns: dataColumns];
637+ [ruleFilterController setColumns: dataColumns];
638638 // Restore preserved filter settings if appropriate and valid
639- [filterControllerInstance restoreSerializedFilters: filtersToRestore];
639+ [ruleFilterController restoreSerializedFilters: filtersToRestore];
640640 // hide/show the rule filter editor, based on its previous state (so that it says visible when switching tables, if someone has enabled it and vice versa)
641641 if (showFilterRuleEditor) {
642642 [self setRuleEditorVisible: YES animate: NO ];
@@ -646,7 +646,7 @@ - (void) setTableDetails:(NSDictionary *)tableDetails
646646 [self setRuleEditorVisible: NO animate: NO ];
647647 [toggleRuleFilterButton setState: NSOffState ];
648648 }
649- [filterControllerInstance setEnabled: enableInteraction];
649+ [ruleFilterController setEnabled: enableInteraction];
650650 [toggleRuleFilterButton setEnabled: enableInteraction];
651651 // restore the filter to the previously choosen one for the table
652652 activeFilter = activeFilterToRestore;
@@ -1014,7 +1014,7 @@ - (NSString *)tableFilterString
10141014 BOOL caseSensitive = (([[NSApp currentEvent ] modifierFlags ] & NSShiftKeyMask ) > 0 );
10151015
10161016 NSError *err = nil ;
1017- NSString *filter = [filterControllerInstance sqlWhereExpressionWithBinary: caseSensitive error: &err];
1017+ NSString *filter = [ruleFilterController sqlWhereExpressionWithBinary: caseSensitive error: &err];
10181018 if (err) {
10191019 SPOnewayAlertSheet (
10201020 NSLocalizedString (@" Invalid Filter" @" table content : apply filter : invalid filter message title"
@@ -1256,7 +1256,7 @@ - (IBAction)filterTable:(id)sender
12561256 }
12571257 // If a button other than the pagination buttons was used, set the active filter type to
12581258 // the standard filter field.
1259- else if (sender == filterControllerInstance ) {
1259+ else if (sender == ruleFilterController ) {
12601260 activeFilter = SPTableContentFilterSourceRuleFilter;
12611261 resetPaging = YES ;
12621262 }
@@ -1349,12 +1349,12 @@ - (void)setRuleEditorVisible:(BOOL)show animate:(BOOL)animate
13491349{
13501350 // we can't change the state of the button here, because the mouse click already changed it
13511351 if (show) {
1352- if ([filterControllerInstance isEmpty ]) {
1353- [filterControllerInstance addFilterExpression ];
1352+ if ([ruleFilterController isEmpty ]) {
1353+ [ruleFilterController addFilterExpression ];
13541354 // the sizing will be updated automatically by adding a row
13551355 }
13561356 else {
1357- [self updateFilterRuleEditorSize: [filterControllerInstance preferredHeight ] animate: animate];
1357+ [self updateFilterRuleEditorSize: [ruleFilterController preferredHeight ] animate: animate];
13581358 }
13591359 }
13601360 else {
@@ -2388,14 +2388,14 @@ - (void)clickLinkArrowTask:(SPTextAndLinkCell *)theArrowCell
23882388 else if (navigateAsHex) filterComparison = @" = (Hex String)"
23892389
23902390 // Store the filter details to use when loading the target table
2391- NSDictionary *filterSettings = [SPTableContentFilterController makeSerializedFilterForColumn: [refDictionary objectForKey: @" column"
2391+ NSDictionary *filterSettings = [SPRuleFilterController makeSerializedFilterForColumn: [refDictionary objectForKey: @" column"
23922392 operator: filterComparison
23932393 values: @[targetFilterValue]];
23942394
23952395 // If the link is within the current table, apply filter settings manually
23962396 if ([[refDictionary objectForKey: @" table" isEqualToString: selectedTable]) {
23972397 SPMainQSync (^{
2398- [filterControllerInstance restoreSerializedFilters: filterSettings];
2398+ [ruleFilterController restoreSerializedFilters: filterSettings];
23992399 [self setRuleEditorVisible: YES animate: YES ];
24002400 activeFilter = SPTableContentFilterSourceRuleFilter;
24012401 });
@@ -3337,7 +3337,7 @@ - (CGFloat) tablesListWidth
33373337 */
33383338- (NSDictionary *) filterSettings
33393339{
3340- return [filterControllerInstance serializedFilter ];
3340+ return [ruleFilterController serializedFilter ];
33413341}
33423342
33433343/* *
@@ -3445,7 +3445,7 @@ - (void)updateFilterRuleEditorSize:(CGFloat)requestedHeight animate:(BOOL)animat
34453445 NSRect contentAreaRect = [contentAreaContainer frame ];
34463446 CGFloat availableHeight = contentAreaRect.size .height ;
34473447
3448- NSRect ruleEditorRect = [[[filterControllerInstance view ] enclosingScrollView ] frame ];
3448+ NSRect ruleEditorRect = [[[ruleFilterController view ] enclosingScrollView ] frame ];
34493449
34503450 // adjust for the UI elements below the rule editor, but only if the view height should not be 0 (ie. hidden)
34513451 CGFloat containerRequestedHeight = requestedHeight ? requestedHeight + ruleEditorRect.origin .y : 0 ;
@@ -3472,18 +3472,18 @@ - (void)updateFilterRuleEditorSize:(CGFloat)requestedHeight animate:(BOOL)animat
34723472 [NSAnimationContext beginGrouping ];
34733473 [[tableContentContainer animator ] setFrame: bottomContainerRect];
34743474 [[filterRuleEditorContainer animator ] setFrame: topContainerRect];
3475- [[[[filterControllerInstance view ] enclosingScrollView ] animator ] setFrame: ruleEditorRect];
3475+ [[[[ruleFilterController view ] enclosingScrollView ] animator ] setFrame: ruleEditorRect];
34763476 [NSAnimationContext endGrouping ];
34773477 }
34783478 else {
34793479 [tableContentContainer setFrameSize: bottomContainerRect.size];
34803480 [filterRuleEditorContainer setFrame: topContainerRect];
3481- [[[filterControllerInstance view ] enclosingScrollView ] setFrame: ruleEditorRect];
3481+ [[[ruleFilterController view ] enclosingScrollView ] setFrame: ruleEditorRect];
34823482 }
34833483
34843484 // disable rubberband scrolling as long as there is nothing to scroll
34853485 if (scrollViewHasRubberbandScrolling) {
3486- NSScrollView *filterControllerScroller = [[filterControllerInstance view ] enclosingScrollView ];
3486+ NSScrollView *filterControllerScroller = [[ruleFilterController view ] enclosingScrollView ];
34873487 if (ruleEditorRect.size .height >= requestedHeight) {
34883488 [filterControllerScroller setVerticalScrollElasticity: NSScrollElasticityNone];
34893489 } else {
@@ -3495,14 +3495,14 @@ - (void)updateFilterRuleEditorSize:(CGFloat)requestedHeight animate:(BOOL)animat
34953495- (void )filterRuleEditorPreferredSizeChanged:(NSNotification *)notification
34963496{
34973497 if (showFilterRuleEditor) {
3498- [self updateFilterRuleEditorSize: [filterControllerInstance preferredHeight ] animate: YES ];
3498+ [self updateFilterRuleEditorSize: [ruleFilterController preferredHeight ] animate: YES ];
34993499 }
35003500}
35013501
35023502- (void )contentViewSizeChanged:(NSNotification *)notification
35033503{
35043504 if (showFilterRuleEditor) {
3505- [self updateFilterRuleEditorSize: [filterControllerInstance preferredHeight ] animate: NO ];
3505+ [self updateFilterRuleEditorSize: [ruleFilterController preferredHeight ] animate: NO ];
35063506 }
35073507}
35083508
@@ -3627,7 +3627,7 @@ - (void) startDocumentTaskForTab:(NSNotification *)aNotification
36273627 [removeButton setEnabled: NO ];
36283628 [duplicateButton setEnabled: NO ];
36293629 [reloadButton setEnabled: NO ];
3630- [filterControllerInstance setEnabled: NO ];
3630+ [ruleFilterController setEnabled: NO ];
36313631 [toggleRuleFilterButton setEnabled: NO ];
36323632 tableRowsSelectable = NO ;
36333633 [paginationPreviousButton setEnabled: NO ];
@@ -3663,7 +3663,7 @@ - (void) endDocumentTaskForTab:(NSNotification *)aNotification
36633663 }
36643664 }
36653665
3666- [filterControllerInstance setEnabled: (!![selectedTable length ])];
3666+ [ruleFilterController setEnabled: (!![selectedTable length ])];
36673667 [toggleRuleFilterButton setEnabled: (!![selectedTable length ])];
36683668 tableRowsSelectable = YES ;
36693669}
@@ -3931,7 +3931,7 @@ - (void)makeContentFilterHaveFocus
39313931{
39323932 [self setRuleEditorVisible: YES animate: YES ];
39333933 [toggleRuleFilterButton setState: NSOnState ];
3934- [filterControllerInstance focusFirstInputField ];
3934+ [ruleFilterController focusFirstInputField ];
39353935}
39363936
39373937#endif
0 commit comments