Skip to content

Commit af369da

Browse files
committed
#63: Some code I forgot to move in the previous commit
1 parent 66e8dc2 commit af369da

File tree

3 files changed

+4
-36
lines changed

3 files changed

+4
-36
lines changed

Source/SPTableContent.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,6 @@ typedef NS_ENUM(NSInteger, SPTableContentFilterSource) {
137137
NSUserDefaults *prefs;
138138
NSInteger currentlyEditingRow, maxNumRows;
139139

140-
NSMutableDictionary *contentFilters;
141-
NSMutableDictionary *numberOfDefaultFilters;
142140
NSUInteger contentPage;
143141

144142
#ifndef SP_CODA

Source/SPTableContent.m

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -178,38 +178,6 @@ - (id)init
178178
blueColor = [NSColor blueColor];
179179
whiteColor = [NSColor whiteColor];
180180

181-
// Init default filters for Content Browser
182-
contentFilters = [[NSMutableDictionary alloc] init];
183-
numberOfDefaultFilters = [[NSMutableDictionary alloc] init];
184-
185-
NSError *readError = nil;
186-
NSString *filePath = [NSBundle pathForResource:@"ContentFilters.plist" ofType:nil inDirectory:[[NSBundle mainBundle] bundlePath]];
187-
NSData *defaultFilterData = [NSData dataWithContentsOfFile:filePath
188-
options:NSMappedRead
189-
error:&readError];
190-
191-
if (defaultFilterData && !readError) {
192-
NSDictionary *defaultFilterDict = [NSPropertyListSerialization propertyListWithData:defaultFilterData
193-
options:NSPropertyListMutableContainersAndLeaves
194-
format:NULL
195-
error:&readError];
196-
197-
if(defaultFilterDict && !readError) {
198-
[contentFilters setDictionary:defaultFilterDict];
199-
}
200-
}
201-
202-
if (readError) {
203-
NSLog(@"Error while reading 'ContentFilters.plist':\n%@", readError);
204-
NSBeep();
205-
}
206-
else {
207-
[numberOfDefaultFilters setObject:[NSNumber numberWithInteger:[[contentFilters objectForKey:@"number"] count]] forKey:@"number"];
208-
[numberOfDefaultFilters setObject:[NSNumber numberWithInteger:[[contentFilters objectForKey:@"date"] count]] forKey:@"date"];
209-
[numberOfDefaultFilters setObject:[NSNumber numberWithInteger:[[contentFilters objectForKey:@"string"] count]] forKey:@"string"];
210-
[numberOfDefaultFilters setObject:[NSNumber numberWithInteger:[[contentFilters objectForKey:@"spatial"] count]] forKey:@"spatial"];
211-
}
212-
213181
kCellEditorErrorNoMatch = NSLocalizedString(@"Field is not editable. No matching record found.\nReload table, check the encoding, or try to add\na primary key field or more fields\nin the view declaration of '%@' to identify\nfield origin unambiguously.", @"Table Content result editing error - could not identify original row");
214182
kCellEditorErrorNoMultiTabDb = NSLocalizedString(@"Field is not editable. Field has no or multiple table or database origin(s).",@"field is not editable due to no table/database");
215183
kCellEditorErrorTooManyMatches = NSLocalizedString(@"Field is not editable. Couldn't identify field origin unambiguously (%ld matches).", @"Query result editing error - could not match row being edited uniquely");
@@ -5227,8 +5195,6 @@ - (void)dealloc
52275195
if (filterTableDefaultOperator) SPClear(filterTableDefaultOperator);
52285196
#endif
52295197
if (selectedTable) SPClear(selectedTable);
5230-
if (contentFilters) SPClear(contentFilters);
5231-
if (numberOfDefaultFilters) SPClear(numberOfDefaultFilters);
52325198
if (keys) SPClear(keys);
52335199
if (sortCol) SPClear(sortCol);
52345200
SPClear(usedQuery);

Source/SPTableContentFilterController.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,9 @@ - (instancetype)init
366366
target = nil;
367367
action = NULL;
368368

369+
// Init default filters for Content Browser
369370
contentFilters = [[NSMutableDictionary alloc] init];
371+
numberOfDefaultFilters = [[NSMutableDictionary alloc] init];
370372

371373
NSError *readError = nil;
372374
NSString *filePath = [NSBundle pathForResource:@"ContentFilters.plist" ofType:nil inDirectory:[[NSBundle mainBundle] bundlePath]];
@@ -670,6 +672,8 @@ - (void)dealloc
670672
[[NSNotificationCenter defaultCenter] removeObserver:self];
671673
SPClear(model);
672674
SPClear(columns);
675+
SPClear(contentFilters);
676+
SPClear(numberOfDefaultFilters);
673677
[super dealloc];
674678
}
675679

0 commit comments

Comments
 (0)