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

renamed refreshAllObjectsAsFaults to refreshAndMergeAllObjects, which is more correct

Browse Source
This commit is contained in:
John Rommel Estropia
2016-05-07 12:04:59 +08:00
parent 74fe81bfa7
commit b9a2f96d6e
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -167,7 +167,7 @@ internal extension NSManagedObjectContext {
} }
} }
internal func refreshAllObjectsAsFaults() { internal func refreshAndMergeAllObjects() {
if #available(iOS 8.3, OSX 10.11, *) { if #available(iOS 8.3, OSX 10.11, *) {
@@ -175,7 +175,7 @@ internal extension NSManagedObjectContext {
} }
else { else {
self.registeredObjects.forEach { self.refreshObject($0, mergeChanges: false) } self.registeredObjects.forEach { self.refreshObject($0, mergeChanges: true) }
} }
} }

4
CoreStore/Saving and Processing/BaseDataTransaction.swift
View File

@@ -191,14 +191,14 @@ public /*abstract*/ class BaseDataTransaction {
/** /**
Refreshes all registered objects `NSManagedObject`s in the transaction. Refreshes all registered objects `NSManagedObject`s in the transaction.
*/ */
public func refreshAllObjectsAsFaults() { public func refreshAndMergeAllObjects() {
CoreStore.assert( CoreStore.assert(
self.isRunningInAllowedQueue(), self.isRunningInAllowedQueue(),
"Attempted to refresh entities outside their designated queue." "Attempted to refresh entities outside their designated queue."
) )
self.context.refreshAllObjectsAsFaults() self.context.refreshAndMergeAllObjects()
} }

4
CoreStore/Saving and Processing/CoreStore+Transaction.swift
View File

@@ -66,9 +66,9 @@ public extension CoreStore {
/** /**
Refreshes all registered objects `NSManagedObject`s in the `DataStack`. Refreshes all registered objects `NSManagedObject`s in the `DataStack`.
*/ */
public static func refreshAllObjectsAsFaults() { public static func refreshAndMergeAllObjects() {
self.defaultStack.refreshAllObjectsAsFaults() self.defaultStack.refreshAndMergeAllObjects()
} }
@available(*, deprecated=1.3.1, renamed="beginUnsafe") @available(*, deprecated=1.3.1, renamed="beginUnsafe")

4
CoreStore/Saving and Processing/DataStack+Transaction.swift
View File

@@ -83,14 +83,14 @@ public extension DataStack {
/** /**
Refreshes all registered objects `NSManagedObject`s in the `DataStack`. Refreshes all registered objects `NSManagedObject`s in the `DataStack`.
*/ */
public func refreshAllObjectsAsFaults() { public func refreshAndMergeAllObjects() {
CoreStore.assert( CoreStore.assert(
NSThread.isMainThread(), NSThread.isMainThread(),
"Attempted to refresh entities outside their designated queue." "Attempted to refresh entities outside their designated queue."
) )
self.mainContext.refreshAllObjectsAsFaults() self.mainContext.refreshAndMergeAllObjects()
} }
@available(*, deprecated=1.3.1, renamed="beginUnsafe") @available(*, deprecated=1.3.1, renamed="beginUnsafe")