fix merge

This commit is contained in:
John Rommel Estropia
2016-05-07 18:13:44 +08:00
parent a6291e116c
commit 0c2a3ac4e9
4 changed files with 8 additions and 8 deletions

View File

@@ -113,9 +113,9 @@ public class CSBaseDataTransaction: NSObject, CoreStoreObjectiveCType {
Refreshes all registered objects `NSManagedObject`s in the transaction.
*/
@objc
public func refreshAllObjectsAsFaults() {
public func refreshAndMergeAllObjects() {
self.bridgeToSwift.refreshAllObjectsAsFaults()
self.bridgeToSwift.refreshAndMergeAllObjects()
}

View File

@@ -98,8 +98,8 @@ public extension CSCoreStore {
Refreshes all registered objects `NSManagedObject`s in the `defaultStack`.
*/
@objc
public static func refreshAllObjectsAsFaults() {
public static func refreshAndMergeAllObjects() {
CoreStore.refreshAllObjectsAsFaults()
CoreStore.refreshAndMergeAllObjects()
}
}

View File

@@ -98,8 +98,8 @@ public extension CSDataStack {
Refreshes all registered objects `NSManagedObject`s in the `DataStack`.
*/
@objc
public func refreshAllObjectsAsFaults() {
public func refreshAndMergeAllObjects() {
self.bridgeToSwift.refreshAllObjectsAsFaults()
self.bridgeToSwift.refreshAndMergeAllObjects()
}
}