starred/CoreStore
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-03-20 16:44:08 +01:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

fix merge

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/Internal/NSManagedObjectContext+Transaction.swift
View File

@@ -61,7 +61,7 @@ internal extension NSManagedObjectContext {
get { get {
let value: NSNumber? = getAssociatedObjectForKey( let value: NSNumber? = cs_getAssociatedObjectForKey(
&PropertyKeys.isSavingSynchronously, &PropertyKeys.isSavingSynchronously,
inObject: self inObject: self
) )
@@ -69,7 +69,7 @@ internal extension NSManagedObjectContext {
} }
set { set {
setAssociatedWeakObject( cs_setAssociatedWeakObject(
newValue.flatMap { NSNumber(bool: $0) }, newValue.flatMap { NSNumber(bool: $0) },
forKey: &PropertyKeys.isSavingSynchronously, forKey: &PropertyKeys.isSavingSynchronously,
inObject: self inObject: self

4
Sources/ObjectiveC/CSBaseDataTransaction.swift
View File

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

4
Sources/ObjectiveC/CSCoreStore+Transaction.swift
View File

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

4
Sources/ObjectiveC/CSDataStack+Transaction.swift
View File

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