Rename _batchUpdateCounter to _changeSetBatchUpdateCounter in ASChangeSetDataController

Rename variable to prevent confusion between the _batchUpdateCounter variable of ASChangeSetDataController and it's superclass
This commit is contained in:
Michael Schneider
2016-03-02 19:35:56 -08:00
parent aa2ae87c81
commit f2f1b25ae4

View File

@@ -15,7 +15,7 @@
@interface ASChangeSetDataController ()
@property (nonatomic, assign) NSUInteger batchUpdateCounter;
@property (nonatomic, assign) NSUInteger changeSetBatchUpdateCounter;
@property (nonatomic, strong) _ASHierarchyChangeSet *changeSet;
@end
@@ -28,7 +28,7 @@
return nil;
}
_batchUpdateCounter = 0;
_changeSetBatchUpdateCounter = 0;
return self;
}
@@ -38,18 +38,18 @@
- (void)beginUpdates
{
ASDisplayNodeAssertMainThread();
if (_batchUpdateCounter == 0) {
if (_changeSetBatchUpdateCounter == 0) {
_changeSet = [_ASHierarchyChangeSet new];
}
_batchUpdateCounter++;
_changeSetBatchUpdateCounter++;
}
- (void)endUpdatesAnimated:(BOOL)animated completion:(void (^)(BOOL))completion
{
ASDisplayNodeAssertMainThread();
_batchUpdateCounter--;
_changeSetBatchUpdateCounter--;
if (_batchUpdateCounter == 0) {
if (_changeSetBatchUpdateCounter == 0) {
[_changeSet markCompleted];
[super beginUpdates];
@@ -86,7 +86,7 @@
- (BOOL)batchUpdating
{
BOOL batchUpdating = (_batchUpdateCounter != 0);
BOOL batchUpdating = (_changeSetBatchUpdateCounter != 0);
// _changeSet must be available during batch update
ASDisplayNodeAssertTrue(batchUpdating == (_changeSet != nil));
return batchUpdating;