Skip to content

Commit 26525ec

Browse files
author
Richard Piazza
committed
Corrected setDefaults implementation
1 parent 3d7cd4b commit 26525ec

File tree

18 files changed

+66
-456
lines changed

18 files changed

+66
-456
lines changed

CodeQuickKit-ObjC/CQKSerializable.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
* SOFTWARE.
2323
*/
2424

25-
typedef NSDictionary<NSString *, __kindof NSObject *> * _Nullable CQKSerializableNSDictionary;
26-
2725
/// A protocol specifying methods for interacting with Dictionary/JSON representations of NSObjects.
2826
@protocol CQKSerializable <NSObject>
2927
/// Initialize an instance of the class and pass the referenced dictionary to updateWithDictionary:.

CodeQuickKit-ObjC/CQKSerializableNSManagedObject.m

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,7 @@ @implementation CQKSerializableNSManagedObject
3838

3939
- (instancetype)initWithEntity:(NSEntityDescription *)entity insertIntoManagedObjectContext:(NSManagedObjectContext *)context
4040
{
41-
self = [super initWithEntity:entity insertIntoManagedObjectContext:context];
42-
if (self != nil) {
43-
[self setDefaults];
44-
}
45-
return self;
41+
return [super initWithEntity:entity insertIntoManagedObjectContext:context];
4642
}
4743

4844
- (instancetype)initIntoManagedObjectContext:(NSManagedObjectContext *)context
@@ -56,6 +52,7 @@ - (instancetype)initIntoManagedObjectContext:(NSManagedObjectContext *)context
5652
}
5753

5854
self = [self initWithEntity:entity insertIntoManagedObjectContext:context];
55+
[self setDefaults];
5956
return self;
6057
}
6158

CodeQuickKit-Swift/Array.swift

Lines changed: 0 additions & 47 deletions
This file was deleted.

CodeQuickKit-Swift/Bool.swift

Lines changed: 0 additions & 31 deletions
This file was deleted.

CodeQuickKit-Swift/Deserializable.swift

Lines changed: 0 additions & 57 deletions
This file was deleted.

CodeQuickKit-Swift/Double.swift

Lines changed: 0 additions & 31 deletions
This file was deleted.

CodeQuickKit-Swift/Float.swift

Lines changed: 0 additions & 31 deletions
This file was deleted.

CodeQuickKit-Swift/Int.swift

Lines changed: 0 additions & 31 deletions
This file was deleted.

CodeQuickKit-Swift/NSArray.swift

Lines changed: 0 additions & 42 deletions
This file was deleted.

CodeQuickKit-Swift/NSDate.swift

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,6 @@
2727

2828
import Foundation
2929

30-
// MARK: - Serializable
31-
extension NSDate: Serializable {
32-
public func serializedValue() -> AnyObject? {
33-
return NSDateFormatter.rfc1123DateFormatter.stringFromDate(self)
34-
}
35-
}
36-
3730
public extension NSDate {
3831
/// Provides the current datetime minus 24 hours.
3932
public static var yesturday: NSDate {

0 commit comments

Comments
 (0)