Objective-C Readability CL for bauerb.

chrome/browser/ui/cocoa/table_model_array_controller.mm

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/table_model_array_controller.h"
 
 #include "app/table_model.h"
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/remove_rows_table_model.h"
 
-@interface TableModelArrayController (PrivateMethods)
+@interface TableModelArrayController ()
 
 - (NSUInteger)offsetForGroupID:(int)groupID;
 - (NSUInteger)offsetForGroupID:(int)groupID startingOffset:(NSUInteger)offset;
 - (NSIndexSet*)controllerRowsForModelRowsInRange:(NSRange)range;
 - (void)setModelRows:(RemoveRowsTableModel::Rows*)modelRows
     fromControllerRows:(NSIndexSet*)rows;
 - (void)modelDidChange;
 - (void)modelDidAddItemsInRange:(NSRange)range;
 - (void)modelDidRemoveItemsInRange:(NSRange)range;
 - (NSDictionary*)columnValuesForRow:(NSInteger)row;
@@ skipping 120 matching lines @@
   NSUInteger offset = 1;
   for (NSUInteger i = range.location; i < NSMaxRange(range); ++i) {
     int group = model_->GetGroupID(i);
     offset = [self offsetForGroupID:group startingOffset:offset];
     [indexes addIndex:i + offset];
   }
   return indexes;
 }
 
 - (void)modelDidAddItemsInRange:(NSRange)range {
+  if (range.length == 0)
+    return;
   NSMutableArray* rows = [NSMutableArray arrayWithCapacity:range.length];
-  for (NSUInteger i=range.location; i<NSMaxRange(range); ++i)
+  for (NSUInteger i = range.location; i < NSMaxRange(range); ++i)
     [rows addObject:[self columnValuesForRow:i]];
-  [self insertObjects:rows
-      atArrangedObjectIndexes:[self controllerRowsForModelRowsInRange:range]];
+  NSArray* indexes = [self controllerRowsForModelRowsInRange:range];
+  [self insertObjects:rows atArrangedObjectIndexes:indexes];
 }
 
 - (void)modelDidRemoveItemsInRange:(NSRange)range {
+  if (range.length == 0)
+    return;
   NSMutableIndexSet* indexes =
       [NSMutableIndexSet indexSetWithIndexesInRange:range];
   if (model_->HasGroups()) {
     // When this method is called, the model has already removed items, so
     // accessing items in the model from |range.location| on may not be possible
     // anymore. Therefore we use the item right before that, if it exists.
     NSUInteger offset = 0;
     if (range.location > 0) {
       int last_group = model_->GetGroupID(range.location - 1);
       offset = [self offsetForGroupID:last_group];
@@ skipping 19 matching lines @@
              forKey:kGroupID];
   }
   for (NSString* identifier in columns_.get()) {
     int column_id = [[columns_ objectForKey:identifier] intValue];
     std::wstring text = model_->GetText(row, column_id);
     [dict setObject:base::SysWideToNSString(text) forKey:identifier];
   }
   return dict;
 }
 
-// Overridden from NSArrayController -----------------------------------------
+#pragma mark Overridden from NSArrayController
 
 - (BOOL)canRemove {
   if (!model_)
     return NO;
   RemoveRowsTableModel::Rows rows;
   [self setModelRows:&rows fromControllerRows:[self selectionIndexes]];
   return model_->CanRemoveRows(rows);
 }
 
 - (IBAction)remove:(id)sender {
   RemoveRowsTableModel::Rows rows;
   [self setModelRows:&rows fromControllerRows:[self selectionIndexes]];
   model_->RemoveRows(rows);
 }
 
-// Table View Delegate --------------------------------------------------------
+#pragma mark NSTableView delegate methods
 
-- (BOOL)tableView:(NSTableView*)tv isGroupRow:(NSInteger)row {
+- (BOOL)tableView:(NSTableView*)tableView isGroupRow:(NSInteger)row {
   NSDictionary* values = [[self arrangedObjects] objectAtIndex:row];
   return [[values objectForKey:kIsGroupRow] boolValue];
 }
 
 - (NSIndexSet*)tableView:(NSTableView*)tableView
     selectionIndexesForProposedSelection:(NSIndexSet*)proposedIndexes {
   NSMutableIndexSet* indexes = [proposedIndexes mutableCopy];
   for (NSUInteger i = [proposedIndexes firstIndex];
        i != NSNotFound;
        i = [proposedIndexes indexGreaterThanIndex:i]) {
     if ([self tableView:tableView isGroupRow:i]) {
       [indexes removeIndex:i];
       NSUInteger row = i + 1;
       while (row < [[self arrangedObjects] count] &&
              ![self tableView:tableView isGroupRow:row])
         [indexes addIndex:row++];
     }
   }
   return indexes;
 }
 
-// Actions --------------------------------------------------------------------
+#pragma mark Actions
 
 - (IBAction)removeAll:(id)sender {
   model_->RemoveAll();
 }
 
 @end
+