CoreDataManagerプロトコルをCoreDataAccessorのサブタイプにした

diff --git a/KCD/BookmarkDataStore.swift b/KCD/BookmarkDataStore.swift
index 09d323b..3459f3e 100644 (file)
--- a/KCD/BookmarkDataStore.swift
+++ b/KCD/BookmarkDataStore.swift
@@ -13,7 +13,7 @@ extension CoreDataConfiguration {
     static let bookmark = CoreDataConfiguration("Bookmark")
 }
 
-final class BookmarkDataStore: CoreDataAccessor, CoreDataManager {
+final class BookmarkDataStore: CoreDataManager {
     
     static let core = CoreDataCore(.bookmark)
     

diff --git a/KCD/CoreDataCore.swift b/KCD/CoreDataCore.swift
index cf10a26..8134add 100644 (file)
--- a/KCD/CoreDataCore.swift
+++ b/KCD/CoreDataCore.swift
@@ -98,7 +98,7 @@ protocol CoreDataAccessor: CoreDataProvider {
     func object(with objectId: NSManagedObjectID) -> NSManagedObject
 }
 
-protocol CoreDataManager {
+protocol CoreDataManager: CoreDataAccessor {
     
     associatedtype InstanceType = Self
     

diff --git a/KCD/LocalDataStore.swift b/KCD/LocalDataStore.swift
index 3324897..21d2151 100644 (file)
--- a/KCD/LocalDataStore.swift
+++ b/KCD/LocalDataStore.swift
@@ -13,7 +13,7 @@ extension CoreDataConfiguration {
     static let local = CoreDataConfiguration("LocalData")
 }
 
-final class LocalDataStore: CoreDataAccessor, CoreDataManager {
+final class LocalDataStore: CoreDataManager {
     
     static let core = CoreDataCore(.local)
     

diff --git a/KCD/ResourceHistoryDataStore.swift b/KCD/ResourceHistoryDataStore.swift
index d04d465..d05978e 100644 (file)
--- a/KCD/ResourceHistoryDataStore.swift
+++ b/KCD/ResourceHistoryDataStore.swift
@@ -13,7 +13,7 @@ extension CoreDataConfiguration {
     static let resourceHistory = CoreDataConfiguration("ResourceHistory")
 }
 
-final class ResourceHistoryDataStore: CoreDataAccessor, CoreDataManager {
+final class ResourceHistoryDataStore: CoreDataManager {
     
     static let core = CoreDataCore(.resourceHistory)
     

diff --git a/KCD/ServerDataStore.swift b/KCD/ServerDataStore.swift
index 33d7a5d..204fbfc 100644 (file)
--- a/KCD/ServerDataStore.swift
+++ b/KCD/ServerDataStore.swift
@@ -13,7 +13,7 @@ extension CoreDataConfiguration {
     static let kcd = CoreDataConfiguration("KCD", tryRemake: true)
 }
 
-final class ServerDataStore: CoreDataAccessor, CoreDataManager {
+final class ServerDataStore: CoreDataManager {
     
     static let core = CoreDataCore(.kcd)
     

diff --git a/KCD/TemporaryDataStore.swift b/KCD/TemporaryDataStore.swift
index d8f70d7..3dd18d4 100644 (file)
--- a/KCD/TemporaryDataStore.swift
+++ b/KCD/TemporaryDataStore.swift
@@ -17,7 +17,7 @@ extension CoreDataConfiguration {
     )
 }
 
-final class TemporaryDataStore: CoreDataAccessor, CoreDataManager {
+final class TemporaryDataStore: CoreDataManager {
     
     static let core = CoreDataCore(.temporary)