HMResourceHistoryDataStoreをSwiftに変換した

diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj
index 9285ce1..6e42b1d 100644 (file)
--- a/KCD.xcodeproj/project.pbxproj
+++ b/KCD.xcodeproj/project.pbxproj
@@ -80,12 +80,12 @@
                F46F45C21CFF0CFF00EB7F4D /* HMSlotDepriveUnsetCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F46F45C11CFF0CFF00EB7F4D /* HMSlotDepriveUnsetCommand.m */; };
                F471784A1B6F9B5600F5E59D /* ResourceHistory.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = F47178481B6F9B5600F5E59D /* ResourceHistory.xcdatamodeld */; };
                F471784D1B6FA18800F5E59D /* HMKCResource.m in Sources */ = {isa = PBXBuildFile; fileRef = F471784C1B6FA18800F5E59D /* HMKCResource.m */; };
-               F47178501B6FA1B300F5E59D /* HMResourceHistoryDataStore.m in Sources */ = {isa = PBXBuildFile; fileRef = F471784F1B6FA1B300F5E59D /* HMResourceHistoryDataStore.m */; };
                F472159E1E1E6EE70083D3BC /* HMShipMasterDetailWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F472159D1E1E6EE70083D3BC /* HMShipMasterDetailWindowController.swift */; };
                F47215A01E1E90C10083D3BC /* HMJSONNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = F472159F1E1E90C10083D3BC /* HMJSONNode.swift */; };
                F47215A21E1F38280083D3BC /* HMQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = F47215A11E1F38280083D3BC /* HMQueue.swift */; };
                F47215A61E1F84B40083D3BC /* HMLocalDataStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = F47215A51E1F84B40083D3BC /* HMLocalDataStore.swift */; };
                F47215A81E1F947A0083D3BC /* HMBookmarkDataStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = F47215A71E1F947A0083D3BC /* HMBookmarkDataStore.swift */; };
+               F47215AA1E1F96B60083D3BC /* HMResourceHistoryDataStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = F47215A91E1F96B60083D3BC /* HMResourceHistoryDataStore.swift */; };
                F48A704D1DE326F0005DFC0B /* HMAirBaseCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F48A704C1DE326F0005DFC0B /* HMAirBaseCommand.m */; };
                F48A70501DE32847005DFC0B /* HMMapInfoCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F48A704F1DE32847005DFC0B /* HMMapInfoCommand.m */; };
                F48A705C1DE58A38005DFC0B /* HMKCAirBase+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = F48A70551DE58A38005DFC0B /* HMKCAirBase+CoreDataClass.m */; };
@@ -451,13 +451,12 @@
                F47178491B6F9B5600F5E59D /* ResourceHistory.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = ResourceHistory.xcdatamodel; sourceTree = "<group>"; };
                F471784B1B6FA18800F5E59D /* HMKCResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMKCResource.h; sourceTree = "<group>"; };
                F471784C1B6FA18800F5E59D /* HMKCResource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMKCResource.m; sourceTree = "<group>"; };
-               F471784E1B6FA1B300F5E59D /* HMResourceHistoryDataStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMResourceHistoryDataStore.h; sourceTree = "<group>"; };
-               F471784F1B6FA1B300F5E59D /* HMResourceHistoryDataStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMResourceHistoryDataStore.m; sourceTree = "<group>"; };
                F472159D1E1E6EE70083D3BC /* HMShipMasterDetailWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMShipMasterDetailWindowController.swift; sourceTree = "<group>"; };
                F472159F1E1E90C10083D3BC /* HMJSONNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMJSONNode.swift; sourceTree = "<group>"; };
                F47215A11E1F38280083D3BC /* HMQueue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMQueue.swift; sourceTree = "<group>"; };
                F47215A51E1F84B40083D3BC /* HMLocalDataStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMLocalDataStore.swift; sourceTree = "<group>"; };
                F47215A71E1F947A0083D3BC /* HMBookmarkDataStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMBookmarkDataStore.swift; sourceTree = "<group>"; };
+               F47215A91E1F96B60083D3BC /* HMResourceHistoryDataStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMResourceHistoryDataStore.swift; sourceTree = "<group>"; };
                F48A704B1DE326F0005DFC0B /* HMAirBaseCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMAirBaseCommand.h; sourceTree = "<group>"; };
                F48A704C1DE326F0005DFC0B /* HMAirBaseCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMAirBaseCommand.m; sourceTree = "<group>"; };
                F48A704E1DE32847005DFC0B /* HMMapInfoCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMapInfoCommand.h; sourceTree = "<group>"; };
@@ -1492,8 +1491,7 @@
                        isa = PBXGroup;
                        children = (
                                F47178481B6F9B5600F5E59D /* ResourceHistory.xcdatamodeld */,
-                               F471784E1B6FA1B300F5E59D /* HMResourceHistoryDataStore.h */,
-                               F471784F1B6FA1B300F5E59D /* HMResourceHistoryDataStore.m */,
+                               F47215A91E1F96B60083D3BC /* HMResourceHistoryDataStore.swift */,
                                F471784B1B6FA18800F5E59D /* HMKCResource.h */,
                                F471784C1B6FA18800F5E59D /* HMKCResource.m */,
                        );
@@ -1897,6 +1895,7 @@
                                F4F6E82A1B3045970008B66E /* CanonicalRequest.m in Sources */,
                                F4E5FF021E150A850026868C /* HMAncherageRepairTimerViewController.swift in Sources */,
                                F4AA59521E1E607F001667AF /* HMJSONViewWindowController.swift in Sources */,
+                               F47215AA1E1F96B60083D3BC /* HMResourceHistoryDataStore.swift in Sources */,
                                F4B414F218B1013C00468DAF /* HMMasterSlotItemCommand.m in Sources */,
                                F45FBB6F1E0FDB33000E72B9 /* HMStrengthenListViewController.swift in Sources */,
                                F4AA59281E1CEF8E001667AF /* HMPlanToShowsBoldFontTransformer.swift in Sources */,
@@ -1925,7 +1924,6 @@
                                F44AB20019E050F600F217AF /* HMKCDeck.m in Sources */,
                                F43F3D4F1A34ACCD00D6DAF7 /* HMKCShipObject.m in Sources */,
                                F448F9951B70E9BE004901AD /* HMKCMaterial.m in Sources */,
-                               F47178501B6FA1B300F5E59D /* HMResourceHistoryDataStore.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/KCD/HMResourceHistoryDataStore.h b/KCD/HMResourceHistoryDataStore.h
deleted file mode 100644 (file)
index 4da0a64..0000000
--- a/KCD/HMResourceHistoryDataStore.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  HMResourceHistoryDataStore.h
-//  KCD
-//
-//  Created by Hori,Masaki on 2015/08/03.
-//  Copyright (c) 2015年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMCoreDataManager.h"
-
-@interface HMResourceHistoryDataStore : HMCoreDataManager
-
-@end

diff --git a/KCD/HMResourceHistoryDataStore.m b/KCD/HMResourceHistoryDataStore.m
deleted file mode 100644 (file)
index d8f8926..0000000
--- a/KCD/HMResourceHistoryDataStore.m
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-//  HMResourceHistoryDataStore.m
-//  KCD
-//
-//  Created by Hori,Masaki on 2015/08/03.
-//  Copyright (c) 2015年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMResourceHistoryDataStore.h"
-
-@implementation HMResourceHistoryDataStore
-+ (void)load
-{
-       static dispatch_once_t onceToken;
-       dispatch_once(&onceToken, ^{
-               [self defaultManager];
-       });
-}
-- (NSString *)modelName
-{
-       return @"ResourceHistory";
-}
-- (NSString *)storeFileName
-{
-       return @"ResourceHistory.storedata";
-}
-- (NSString *)storeType
-{
-       return NSSQLiteStoreType;
-}
-- (NSDictionary *)storeOptions
-{
-       NSDictionary *options = @{
-                                                         NSMigratePersistentStoresAutomaticallyOption : @YES,
-                                                         NSInferMappingModelAutomaticallyOption : @YES
-                                                         };
-       return options;
-}
-- (BOOL)deleteAndRetry
-{
-       return NO;
-}
-@end

diff --git a/KCD/HMResourceHistoryDataStore.swift b/KCD/HMResourceHistoryDataStore.swift
new file mode 100644 (file)
index 0000000..9b77b50
--- /dev/null
+++ b/KCD/HMResourceHistoryDataStore.swift
@@ -0,0 +1,22 @@
+//
+//  HMResourceHistoryDataStore.swift
+//  KCD
+//
+//  Created by Hori,Masaki on 2017/01/06.
+//  Copyright © 2017年 Hori,Masaki. All rights reserved.
+//
+
+import Cocoa
+
+class HMResourceHistoryDataStore: HMCoreDataManager {
+    override var modelName: String { return "ResourceHistory" }
+    override var storeFileName: String { return "ResourceHistory.storedata" }
+    override var storeType: String { return NSSQLiteStoreType }
+    override var storeOptions: [AnyHashable : Any] {
+        return [
+            NSMigratePersistentStoresAutomaticallyOption: NSNumber(value: true),
+            NSInferMappingModelAutomaticallyOption: NSNumber(value: true)
+        ]
+    }
+    override var deleteAndRetry: Bool { return false }
+}

diff --git a/KCD/HMResourceHistoryManager.m b/KCD/HMResourceHistoryManager.m
index 8eedc08..b469772 100644 (file)
--- a/KCD/HMResourceHistoryManager.m
+++ b/KCD/HMResourceHistoryManager.m
@@ -11,7 +11,6 @@
 #import "KCD-Swift.h"
 
 #import "HMServerDataStore.h"
-#import "HMResourceHistoryDataStore.h"
 
 #import "HMKCMaterial.h"
 #import "HMKCBasic.h"