HMMasterSlotItemCommandをSwiftに変換した

diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj
index 3b7275b..358ebca 100644 (file)
--- a/KCD.xcodeproj/project.pbxproj
+++ b/KCD.xcodeproj/project.pbxproj
@@ -82,6 +82,7 @@
                F44BC71F1E29E740004644E3 /* HMMasterSlotItemEquipTypeCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44BC71E1E29E740004644E3 /* HMMasterSlotItemEquipTypeCommand.swift */; };
                F44BC7211E29E82B004644E3 /* HMMasterMissionCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44BC7201E29E82B004644E3 /* HMMasterMissionCommand.swift */; };
                F44BC7231E29E8E6004644E3 /* HMMasterFurnitureCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44BC7221E29E8E6004644E3 /* HMMasterFurnitureCommand.swift */; };
+               F44BC7251E29EC26004644E3 /* HMMasterSlotItemCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44BC7241E29EC26004644E3 /* HMMasterSlotItemCommand.swift */; };
                F4513EDD18B619B600073552 /* HMCoreDataManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F4513EDC18B619B600073552 /* HMCoreDataManager.m */; };
                F45771231E1BCC7C008A9215 /* HMPeriodicNotifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = F45771221E1BCC7C008A9215 /* HMPeriodicNotifier.swift */; };
                F45F3BE11E067A870009434E /* HMHistoryItemCleaner.swift in Sources */ = {isa = PBXBuildFile; fileRef = F45F3BE01E067A870009434E /* HMHistoryItemCleaner.swift */; };
@@ -196,7 +197,6 @@
                F4B414E918B09A4B00468DAF /* HMMasterMapAreaCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B414E818B09A4B00468DAF /* HMMasterMapAreaCommand.m */; };
                F4B414EC18B0A7D600468DAF /* HMMasterUseItemCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B414EB18B0A7D600468DAF /* HMMasterUseItemCommand.m */; };
                F4B414EF18B0BF1A00468DAF /* HMMasterMapInfoCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B414EE18B0BF1A00468DAF /* HMMasterMapInfoCommand.m */; };
-               F4B414F218B1013C00468DAF /* HMMasterSlotItemCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B414F118B1013C00468DAF /* HMMasterSlotItemCommand.m */; };
                F4B414FB18B1FB6C00468DAF /* HMMasterMapCellCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B414FA18B1FB6C00468DAF /* HMMasterMapCellCommand.m */; };
                F4BDEB47187252F30069D0CE /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F4BDEB46187252F30069D0CE /* Cocoa.framework */; };
                F4BDEB51187252F30069D0CE /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F4BDEB4F187252F30069D0CE /* InfoPlist.strings */; };
@@ -415,6 +415,7 @@
                F44BC71E1E29E740004644E3 /* HMMasterSlotItemEquipTypeCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMMasterSlotItemEquipTypeCommand.swift; sourceTree = "<group>"; };
                F44BC7201E29E82B004644E3 /* HMMasterMissionCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMMasterMissionCommand.swift; sourceTree = "<group>"; };
                F44BC7221E29E8E6004644E3 /* HMMasterFurnitureCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMMasterFurnitureCommand.swift; sourceTree = "<group>"; };
+               F44BC7241E29EC26004644E3 /* HMMasterSlotItemCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMMasterSlotItemCommand.swift; sourceTree = "<group>"; };
                F4513EDB18B619B600073552 /* HMCoreDataManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMCoreDataManager.h; sourceTree = "<group>"; };
                F4513EDC18B619B600073552 /* HMCoreDataManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMCoreDataManager.m; sourceTree = "<group>"; };
                F45771221E1BCC7C008A9215 /* HMPeriodicNotifier.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMPeriodicNotifier.swift; sourceTree = "<group>"; };
@@ -570,8 +571,6 @@
                F4B414EB18B0A7D600468DAF /* HMMasterUseItemCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMasterUseItemCommand.m; sourceTree = "<group>"; };
                F4B414ED18B0BF1A00468DAF /* HMMasterMapInfoCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMasterMapInfoCommand.h; sourceTree = "<group>"; };
                F4B414EE18B0BF1A00468DAF /* HMMasterMapInfoCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMasterMapInfoCommand.m; sourceTree = "<group>"; };
-               F4B414F018B1013C00468DAF /* HMMasterSlotItemCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMasterSlotItemCommand.h; sourceTree = "<group>"; };
-               F4B414F118B1013C00468DAF /* HMMasterSlotItemCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMasterSlotItemCommand.m; sourceTree = "<group>"; };
                F4B414F918B1FB6C00468DAF /* HMMasterMapCellCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMasterMapCellCommand.h; sourceTree = "<group>"; };
                F4B414FA18B1FB6C00468DAF /* HMMasterMapCellCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMasterMapCellCommand.m; sourceTree = "<group>"; };
                F4BDEB43187252F30069D0CE /* KCD.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = KCD.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -812,8 +811,7 @@
                                F4B414FA18B1FB6C00468DAF /* HMMasterMapCellCommand.m */,
                                F4B414EA18B0A7D600468DAF /* HMMasterUseItemCommand.h */,
                                F4B414EB18B0A7D600468DAF /* HMMasterUseItemCommand.m */,
-                               F4B414F018B1013C00468DAF /* HMMasterSlotItemCommand.h */,
-                               F4B414F118B1013C00468DAF /* HMMasterSlotItemCommand.m */,
+                               F44BC7241E29EC26004644E3 /* HMMasterSlotItemCommand.swift */,
                                F44BC7221E29E8E6004644E3 /* HMMasterFurnitureCommand.swift */,
                                F44BC7201E29E82B004644E3 /* HMMasterMissionCommand.swift */,
                                F44BC71E1E29E740004644E3 /* HMMasterSlotItemEquipTypeCommand.swift */,
@@ -1674,6 +1672,7 @@
                                F4D05BC81E0C0DA100688D66 /* HMAirBaseWindowController.swift in Sources */,
                                F44BC70D1E27B601004644E3 /* HMMemberShip3Command.swift in Sources */,
                                F4C1190518A71AEA005D5B25 /* HMJSONReciever.m in Sources */,
+                               F44BC7251E29EC26004644E3 /* HMMasterSlotItemCommand.swift in Sources */,
                                F4F9F8901C6B6ACA00D0EE76 /* HMKCNyukyoDock.m in Sources */,
                                F44AB24119E8252600F217AF /* HMKCSlotItemObject+Extensions.m in Sources */,
                                F4D05BE11E0FAB8E00688D66 /* HMShipViewController.swift in Sources */,
@@ -1796,7 +1795,6 @@
                                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 */,
                                F44BC6CB1E223208004644E3 /* HMIgnoreCommand.swift in Sources */,
                                F4AA59281E1CEF8E001667AF /* HMPlanToShowsBoldFontTransformer.swift in Sources */,

diff --git a/KCD/HMMasterSlotItemCommand.h b/KCD/HMMasterSlotItemCommand.h
deleted file mode 100644 (file)
index 46d48d5..0000000
--- a/KCD/HMMasterSlotItemCommand.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  HMMasterSlotItemCommand.h
-//  KCD
-//
-//  Created by Hori,Masaki on 2014/02/16.
-//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMJSONCommand.h"
-
-@interface HMMasterSlotItemCommand : HMJSONCommand
-
-@end

diff --git a/KCD/HMMasterSlotItemCommand.m b/KCD/HMMasterSlotItemCommand.m
deleted file mode 100644 (file)
index 59f045d..0000000
--- a/KCD/HMMasterSlotItemCommand.m
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-//  HMMasterSlotItemCommand.m
-//  KCD
-//
-//  Created by Hori,Masaki on 2014/02/16.
-//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMMasterSlotItemCommand.h"
-
-@implementation HMMasterSlotItemCommand
-- (NSString *)dataKey
-{
-       return @"api_data.api_mst_slotitem";
-}
-- (void)execute
-{
-       [self commitJSONToEntityNamed:@"MasterSlotItem"];
-}
-@end

diff --git a/KCD/HMMasterSlotItemCommand.swift b/KCD/HMMasterSlotItemCommand.swift
new file mode 100644 (file)
index 0000000..8eb462e
--- /dev/null
+++ b/KCD/HMMasterSlotItemCommand.swift
@@ -0,0 +1,19 @@
+//
+//  HMMasterSlotItemCommand.swift
+//  KCD
+//
+//  Created by Hori,Masaki on 2017/01/14.
+//  Copyright © 2017年 Hori,Masaki. All rights reserved.
+//
+
+import Cocoa
+
+class HMMasterSlotItemCommand: HMJSONCommand {
+    override var dataKey: String {
+        return "api_data.api_mst_slotitem"
+    }
+    
+    override func execute() {
+        commitJSON(toEntityNamed: "MasterSlotItem")
+    }
+}

diff --git a/KCD/HMStart2Command.m b/KCD/HMStart2Command.m
index acdb782..e8a0bc9 100644 (file)
--- a/KCD/HMStart2Command.m
+++ b/KCD/HMStart2Command.m
@@ -14,7 +14,6 @@
 #import "HMMasterMapInfoCommand.h"
 #import "HMMasterSTypeCommand.h"
 #import "HMMaserShipCommand.h"
-#import "HMMasterSlotItemCommand.h"
 #import "HMMasterUseItemCommand.h"