From f6d30b668d930dc3cd99723d418493f53b4e2f7e Mon Sep 17 00:00:00 2001 From: Hannah Trosi Date: Tue, 5 Jul 2016 21:30:09 -0700 Subject: [PATCH] add comments to deprecated getter methods, remove extraneous if statements --- AsyncDisplayKit/ASCellNode.h | 4 ++++ AsyncDisplayKit/ASCollectionView.mm | 8 ++------ AsyncDisplayKit/ASTableView.mm | 8 ++------ 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/AsyncDisplayKit/ASCellNode.h b/AsyncDisplayKit/ASCellNode.h index 1d642b9b66..fe919c23d5 100644 --- a/AsyncDisplayKit/ASCellNode.h +++ b/AsyncDisplayKit/ASCellNode.h @@ -126,6 +126,10 @@ typedef NS_ENUM(NSUInteger, ASCellNodeVisibilityEvent) { @interface ASCellNode (Deprecated) +/** + * Previous versions of ASDK did not include "is" in the name of the getter for these properties. + * These older accessor methods don't match UIKit naming, and will be removed in a future version. + */ - (BOOL)selected ASDISPLAYNODE_DEPRECATED; - (BOOL)highlighted ASDISPLAYNODE_DEPRECATED; diff --git a/AsyncDisplayKit/ASCollectionView.mm b/AsyncDisplayKit/ASCollectionView.mm index c81450e267..59616f563a 100644 --- a/AsyncDisplayKit/ASCollectionView.mm +++ b/AsyncDisplayKit/ASCollectionView.mm @@ -42,12 +42,8 @@ static NSString * const kCellReuseIdentifier = @"_ASCollectionViewCell"; - (void)setNode:(ASCellNode *)node { _node = node; - if (node.selected != self.selected) { - [node __setSelectedFromUIKit:self.selected]; - } - if (node.highlighted != self.highlighted) { - [node __setHighlightedFromUIKit:self.highlighted]; - } + [node __setSelectedFromUIKit:self.selected]; + [node __setHighlightedFromUIKit:self.highlighted]; } - (void)setSelected:(BOOL)selected diff --git a/AsyncDisplayKit/ASTableView.mm b/AsyncDisplayKit/ASTableView.mm index 4f04ede236..6528874e03 100644 --- a/AsyncDisplayKit/ASTableView.mm +++ b/AsyncDisplayKit/ASTableView.mm @@ -67,12 +67,8 @@ static NSString * const kCellReuseIdentifier = @"_ASTableViewCell"; - (void)setNode:(ASCellNode *)node { _node = node; - if (node.selected != self.selected) { - [node __setSelectedFromUIKit:self.selected]; - } - if (node.highlighted != self.highlighted) { - [node __setHighlightedFromUIKit:self.highlighted]; - } + [node __setSelectedFromUIKit:self.selected]; + [node __setHighlightedFromUIKit:self.highlighted]; } - (void)setSelected:(BOOL)selected animated:(BOOL)animated