Permalink
Browse files

Replace some for for() loops with FastEnumeration where i is not needed

Also has the advantage of causing an exception on concurrent modification
  • Loading branch information...
dmoagx committed Oct 4, 2015
1 parent 5239e6d commit cd3ebbe91342860da332eef7c744b143b3094bbf
Showing with 5 additions and 12 deletions.
  1. +5 −12 Source/SPTableContent.m
@@ -372,12 +372,11 @@ - (void)loadTable:(NSString *)aTable
- (void) setTableDetails:(NSDictionary *)tableDetails
{
NSString *newTableName;
NSInteger i, sortColumnNumberToRestore = NSNotFound;
NSInteger sortColumnNumberToRestore = NSNotFound;
#ifndef SP_CODA
NSNumber *colWidth;
#endif
NSArray *columnNames;
NSDictionary *columnDefinition;
NSMutableDictionary *preservedColumnWidths = nil;
NSTableColumn *theCol;
#ifndef SP_CODA
@@ -566,8 +565,7 @@ - (void) setTableDetails:(NSDictionary *)tableDetails
[tableContentView setRowHeight:2.0f+NSSizeToCGSize([@"{ǞṶḹÜ∑zgyf" sizeWithAttributes:@{NSFontAttributeName : tableFont}]).height];
// Add the new columns to the table and filterTable
for ( i = 0 ; i < (NSInteger)[dataColumns count] ; i++ ) {
columnDefinition = NSArrayObjectAtIndex(dataColumns, i);
for (NSDictionary *columnDefinition in dataColumns ) {
// Set up the column
theCol = [[NSTableColumn alloc] initWithIdentifier:[columnDefinition objectForKey:@"datacolumnindex"]];
@@ -1810,18 +1808,15 @@ - (NSString *)argumentForRow:(NSUInteger)rowIndex ofTable:(NSString *)tableForCo
*/
- (IBAction)addRow:(id)sender
{
NSMutableDictionary *column;
NSMutableArray *newRow = [NSMutableArray array];
NSUInteger i;
// Check whether table editing is permitted (necessary as some actions - eg table double-click - bypass validation)
if ([tableDocumentInstance isWorking] || [tablesListInstance tableType] != SPTableTypeTable) return;
// Check whether a save of the current row is required.
if ( ![self saveRowOnDeselect] ) return;
for ( i = 0 ; i < [dataColumns count] ; i++ ) {
column = NSArrayObjectAtIndex(dataColumns, i);
for (NSDictionary *column in dataColumns) {
if ([column objectForKey:@"default"] == nil || [[column objectForKey:@"default"] isNSNull]) {
[newRow addObject:[NSNull null]];
} else if ([[column objectForKey:@"default"] isEqualToString:@""]
@@ -3146,10 +3141,8 @@ - (NSString *)argumentForRow:(NSInteger)row excludingLimits:(BOOL)excludeLimits
*/
- (BOOL)tableContainsBlobOrTextColumns
{
NSUInteger i;
for ( i = 0 ; i < [dataColumns count]; i++ ) {
if ( [tableDataInstance columnIsBlobOrText:[NSArrayObjectAtIndex(dataColumns, i) objectForKey:@"name"]] ) {
for (NSDictionary *column in dataColumns) {
if ( [tableDataInstance columnIsBlobOrText:[column objectForKey:@"name"]] ) {
return YES;
}
}

0 comments on commit cd3ebbe

Please sign in to comment.