From a94cd9dd990aa5bc7a2617c33aab8d8207f2e4c6 Mon Sep 17 00:00:00 2001 From: Huy Nguyen Date: Mon, 28 Sep 2015 00:18:49 +0300 Subject: [PATCH] Remove externalCompletedNodes getter in ASDataController. --- AsyncDisplayKit/Details/ASDataController.mm | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/AsyncDisplayKit/Details/ASDataController.mm b/AsyncDisplayKit/Details/ASDataController.mm index 7a603686..693f1653 100644 --- a/AsyncDisplayKit/Details/ASDataController.mm +++ b/AsyncDisplayKit/Details/ASDataController.mm @@ -40,9 +40,6 @@ static void *kASSizingQueueContext = &kASSizingQueueContext; @property (atomic, assign) NSUInteger batchUpdateCounter; -/// Returns nodes that can be queried externally. _externalCompletedNodes is used if available, _completedNodes otherwise. -- (NSMutableArray *)externalCompletedNodes; - @end @implementation ASDataController @@ -628,26 +625,26 @@ static void *kASSizingQueueContext = &kASSizingQueueContext; - (NSUInteger)numberOfSections { ASDisplayNodeAssertMainThread(); - return [[self externalCompletedNodes] count]; + return [[self completedNodes] count]; } - (NSUInteger)numberOfRowsInSection:(NSUInteger)section { ASDisplayNodeAssertMainThread(); - return [[self externalCompletedNodes][section] count]; + return [[self completedNodes][section] count]; } - (ASCellNode *)nodeAtIndexPath:(NSIndexPath *)indexPath { ASDisplayNodeAssertMainThread(); - return [self externalCompletedNodes][indexPath.section][indexPath.row]; + return [self completedNodes][indexPath.section][indexPath.row]; } - (NSIndexPath *)indexPathForNode:(ASCellNode *)cellNode; { ASDisplayNodeAssertMainThread(); - NSArray *nodes = [self externalCompletedNodes]; + NSArray *nodes = [self completedNodes]; NSUInteger numberOfNodes = nodes.count; // Loop through each section to look for the cellNode @@ -665,17 +662,13 @@ static void *kASSizingQueueContext = &kASSizingQueueContext; - (NSArray *)nodesAtIndexPaths:(NSArray *)indexPaths { ASDisplayNodeAssertMainThread(); - return ASFindElementsInMultidimensionalArrayAtIndexPaths([self externalCompletedNodes], [indexPaths sortedArrayUsingSelector:@selector(compare:)]); + return ASFindElementsInMultidimensionalArrayAtIndexPaths((NSMutableArray *)[self completedNodes], [indexPaths sortedArrayUsingSelector:@selector(compare:)]); } +/// Returns nodes that can be queried externally. _externalCompletedNodes is used if available, _completedNodes otherwise. - (NSArray *)completedNodes { ASDisplayNodeAssertMainThread(); - return [self externalCompletedNodes]; -} - -- (NSMutableArray *)externalCompletedNodes -{ return _externalCompletedNodes != nil ? _externalCompletedNodes : _completedNodes; }