CoreDataCoreのプロパティ名を簡略化

diff --git a/KCD/BookmarkDataStore.swift b/KCD/BookmarkDataStore.swift
index 2e1e20c..06565ad 100644 (file)
--- a/KCD/BookmarkDataStore.swift
+++ b/KCD/BookmarkDataStore.swift
@@ -23,8 +23,7 @@ class BookmarkDataStore: CoreDataAccessor, CoreDataManager {
     
     required init(type: CoreDataManagerType) {
         managedObjectContext =
-            type == .reader ? core.parentManagedObjectContext
-            : core.editorManagedObjectContext()
+            type == .reader ? core.parentContext : core.editorContext()
     }
     deinit {
         saveActionCore()

diff --git a/KCD/CoreDataCore.swift b/KCD/CoreDataCore.swift
index 001b5b8..15e8cea 100644 (file)
--- a/KCD/CoreDataCore.swift
+++ b/KCD/CoreDataCore.swift
@@ -46,25 +46,23 @@ struct CoreDataIntormation {
 
 struct CoreDataCore {
     let info: CoreDataIntormation
-    let managedObjectModel: NSManagedObjectModel
-    let persistentStoreCoordinator: NSPersistentStoreCoordinator
-    let parentManagedObjectContext: NSManagedObjectContext
+    let model: NSManagedObjectModel
+    let coordinator: NSPersistentStoreCoordinator
+    let parentContext: NSManagedObjectContext
     
     init(_ info: CoreDataIntormation) {
         self.info = info
         do {
             let genaratee = try MocGenerater.genarate(info)
-            self.managedObjectModel = genaratee.model
-            self.persistentStoreCoordinator = genaratee.coordinator
-            self.parentManagedObjectContext = genaratee.moc
+            (self.model, self.coordinator, self.parentContext) = genaratee
         } catch {
             fatalError("CoreDataCore: can not initialize. \(error)")
         }
     }
     
-    func editorManagedObjectContext() -> NSManagedObjectContext {
+    func editorContext() -> NSManagedObjectContext {
         let moc = NSManagedObjectContext(concurrencyType: .privateQueueConcurrencyType)
-        moc.parent = parentManagedObjectContext
+        moc.parent = parentContext
         moc.undoManager = nil
         return moc
     }

diff --git a/KCD/LocalDataStore.swift b/KCD/LocalDataStore.swift
index 9711beb..ac0ad25 100644 (file)
--- a/KCD/LocalDataStore.swift
+++ b/KCD/LocalDataStore.swift
@@ -24,8 +24,7 @@ class LocalDataStore: CoreDataAccessor, CoreDataManager {
     
     required init(type: CoreDataManagerType) {
         managedObjectContext =
-            type == .reader ? core.parentManagedObjectContext
-            : core.editorManagedObjectContext()
+            type == .reader ? core.parentContext : core.editorContext()
     }
     deinit {
         saveActionCore()

diff --git a/KCD/ResourceHistoryDataStore.swift b/KCD/ResourceHistoryDataStore.swift
index 051d989..d0f73d2 100644 (file)
--- a/KCD/ResourceHistoryDataStore.swift
+++ b/KCD/ResourceHistoryDataStore.swift
@@ -23,8 +23,7 @@ class ResourceHistoryDataStore: CoreDataAccessor, CoreDataManager {
     
     required init(type: CoreDataManagerType) {
         managedObjectContext =
-            type == .reader ? core.parentManagedObjectContext
-                : core.editorManagedObjectContext()
+            type == .reader ? core.parentContext : core.editorContext()
     }
     deinit {
         saveActionCore()

diff --git a/KCD/ServerDataStore.swift b/KCD/ServerDataStore.swift
index aeb3a6f..27d30f8 100644 (file)
--- a/KCD/ServerDataStore.swift
+++ b/KCD/ServerDataStore.swift
@@ -23,8 +23,7 @@ class ServerDataStore: CoreDataAccessor, CoreDataManager {
         
     required init(type: CoreDataManagerType) {
         managedObjectContext =
-            type == .reader ? core.parentManagedObjectContext
-            : core.editorManagedObjectContext()
+            type == .reader ? core.parentContext : core.editorContext()
     }
     deinit {
         saveActionCore()

diff --git a/KCD/TemporaryDataStore.swift b/KCD/TemporaryDataStore.swift
index e9f63d3..6eb2cff 100644 (file)
--- a/KCD/TemporaryDataStore.swift
+++ b/KCD/TemporaryDataStore.swift
@@ -27,8 +27,7 @@ class TemporaryDataStore: CoreDataAccessor, CoreDataManager {
     
     required init(type: CoreDataManagerType) {
         managedObjectContext =
-            type == .reader ? core.parentManagedObjectContext
-            : core.editorManagedObjectContext()
+            type == .reader ? core.parentContext : core.editorContext()
     }
     deinit {
         saveActionCore()