CoreDataConfigurationをstaticに持たないようにした

diff --git a/KCD/BookmarkDataStore.swift b/KCD/BookmarkDataStore.swift
index 3459f3e..66bf350 100644 (file)
--- a/KCD/BookmarkDataStore.swift
+++ b/KCD/BookmarkDataStore.swift
@@ -8,14 +8,9 @@
 
 import Cocoa
 
-extension CoreDataConfiguration {
-    
-    static let bookmark = CoreDataConfiguration("Bookmark")
-}
-
 final class BookmarkDataStore: CoreDataManager {
     
-    static let core = CoreDataCore(.bookmark)
+    static let core = CoreDataCore(CoreDataConfiguration("Bookmark"))
     
     static let `default` = BookmarkDataStore(type: .reader)
     

diff --git a/KCD/LocalDataStore.swift b/KCD/LocalDataStore.swift
index 21d2151..2708e51 100644 (file)
--- a/KCD/LocalDataStore.swift
+++ b/KCD/LocalDataStore.swift
@@ -8,14 +8,9 @@
 
 import Cocoa
 
-extension CoreDataConfiguration {
-    
-    static let local = CoreDataConfiguration("LocalData")
-}
-
 final class LocalDataStore: CoreDataManager {
     
-    static let core = CoreDataCore(.local)
+    static let core = CoreDataCore(CoreDataConfiguration("LocalData"))
     
     static let `default` = LocalDataStore(type: .reader)
     

diff --git a/KCD/ResourceHistoryDataStore.swift b/KCD/ResourceHistoryDataStore.swift
index d05978e..1f415c5 100644 (file)
--- a/KCD/ResourceHistoryDataStore.swift
+++ b/KCD/ResourceHistoryDataStore.swift
@@ -8,14 +8,9 @@
 
 import Cocoa
 
-extension CoreDataConfiguration {
-    
-    static let resourceHistory = CoreDataConfiguration("ResourceHistory")
-}
-
 final class ResourceHistoryDataStore: CoreDataManager {
     
-    static let core = CoreDataCore(.resourceHistory)
+    static let core = CoreDataCore(CoreDataConfiguration("ResourceHistory"))
     
     static let `default` = ResourceHistoryDataStore(type: .reader)
     

diff --git a/KCD/ServerDataStore.swift b/KCD/ServerDataStore.swift
index 8010660..7d80b32 100644 (file)
--- a/KCD/ServerDataStore.swift
+++ b/KCD/ServerDataStore.swift
@@ -8,14 +8,9 @@
 
 import Cocoa
 
-extension CoreDataConfiguration {
-    
-    static let kcd = CoreDataConfiguration("KCD", tryRemake: true)
-}
-
 final class ServerDataStore: CoreDataManager {
     
-    static let core = CoreDataCore(.kcd)
+    static let core = CoreDataCore(CoreDataConfiguration("KCD", tryRemake: true))
     
     static let `default` = ServerDataStore(type: .reader)
     

diff --git a/KCD/TemporaryDataStore.swift b/KCD/TemporaryDataStore.swift
index 3dd18d4..db2fe65 100644 (file)
--- a/KCD/TemporaryDataStore.swift
+++ b/KCD/TemporaryDataStore.swift
@@ -8,18 +8,12 @@
 
 import Cocoa
 
-extension CoreDataConfiguration {
-    
-    static let temporary = CoreDataConfiguration("Temporary",
-                                                 fileName: ":memory:",
-                                                 options: [:],
-                                                 type: NSInMemoryStoreType
-    )
-}
-
 final class TemporaryDataStore: CoreDataManager {
     
-    static let core = CoreDataCore(.temporary)
+    static let core = CoreDataCore(CoreDataConfiguration("Temporary",
+                                                         fileName: ":memory:",
+                                                         options: [:],
+                                                         type: NSInMemoryStoreType))
     
     static let `default` = TemporaryDataStore(type: .reader)