Skip to content

Commit 862d209

Browse files
committed
Some naming improvements.
1 parent 7d55eb9 commit 862d209

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

KVC Validation Pattern/KVC Validation Pattern/Model/CTCBaseModel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
@property (nonatomic, strong, readonly) NSString *dictionaryKey;
1616
@property (nonatomic, readonly, strong) NSDictionary *undefinedKeys;
1717

18-
- (id)initWithDictionary:(NSDictionary *)jsonObject;
18+
- (id)initWithDictionary:(NSDictionary *)dictionary;
1919

2020
+ (NSString *)calculateClassName;
2121

KVC Validation Pattern/KVC Validation Pattern/Model/CTCBaseModel.m

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ typedef NS_ENUM(NSUInteger, CTCPropertyType){
3030
};
3131

3232
@implementation CTCBaseModel {
33-
33+
dispatch_once_t keyToken;
3434
}
3535
static NSMutableDictionary *modelProperties;
3636
static dispatch_once_t onceToken;
@@ -49,15 +49,21 @@ + (void)initialize {
4949
[modelProperties setObject:translateNameDict forKey:[self calculateClassName]];
5050
}
5151

52-
- (id)initWithDictionary:(NSDictionary *)jsonObject {
52+
- (id)initWithDictionary:(NSDictionary *)dictionary {
5353
self = [self init];
5454
if (self){
55-
_dictionaryKey = [[self class] calculateClassName];
56-
[self setValuesForKeysWithDictionary:jsonObject];
55+
[self setValuesForKeysWithDictionary:dictionary];
5756
}
5857
return self;
5958
}
6059

60+
- (NSString *)dictionaryKey {
61+
dispatch_once(&keyToken, ^{
62+
_dictionaryKey = [[self class] calculateClassName];
63+
});
64+
return _dictionaryKey;
65+
}
66+
6167
#pragma mark - KVC methods
6268

6369
- (void)setValue:(id)value forKey:(NSString *)key {

0 commit comments

Comments
 (0)