HMMasterMissionCommandをSwiftに変換した

diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj
index 3ac4a64..ce5b229 100644 (file)
--- a/KCD.xcodeproj/project.pbxproj
+++ b/KCD.xcodeproj/project.pbxproj
@@ -80,6 +80,7 @@
                F44BC71B1E29DCB4004644E3 /* HMMemberKDockCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44BC71A1E29DCB4004644E3 /* HMMemberKDockCommand.swift */; };
                F44BC71D1E29DF32004644E3 /* HMMemberNDockCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44BC71C1E29DF32004644E3 /* HMMemberNDockCommand.swift */; };
                F44BC71F1E29E740004644E3 /* HMMasterSlotItemEquipTypeCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44BC71E1E29E740004644E3 /* HMMasterSlotItemEquipTypeCommand.swift */; };
+               F44BC7211E29E82B004644E3 /* HMMasterMissionCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44BC7201E29E82B004644E3 /* HMMasterMissionCommand.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 @@
                F4B414EF18B0BF1A00468DAF /* HMMasterMapInfoCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B414EE18B0BF1A00468DAF /* HMMasterMapInfoCommand.m */; };
                F4B414F218B1013C00468DAF /* HMMasterSlotItemCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B414F118B1013C00468DAF /* HMMasterSlotItemCommand.m */; };
                F4B414F518B1888800468DAF /* HMMasterFurnitureCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B414F418B1888800468DAF /* HMMasterFurnitureCommand.m */; };
-               F4B414F818B1D35800468DAF /* HMMasterMissionCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B414F718B1D35800468DAF /* HMMasterMissionCommand.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 */; };
@@ -413,6 +413,7 @@
                F44BC71A1E29DCB4004644E3 /* HMMemberKDockCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMMemberKDockCommand.swift; sourceTree = "<group>"; };
                F44BC71C1E29DF32004644E3 /* HMMemberNDockCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMMemberNDockCommand.swift; sourceTree = "<group>"; };
                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>"; };
                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>"; };
@@ -572,8 +573,6 @@
                F4B414F118B1013C00468DAF /* HMMasterSlotItemCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMasterSlotItemCommand.m; sourceTree = "<group>"; };
                F4B414F318B1888800468DAF /* HMMasterFurnitureCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMasterFurnitureCommand.h; sourceTree = "<group>"; };
                F4B414F418B1888800468DAF /* HMMasterFurnitureCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMasterFurnitureCommand.m; sourceTree = "<group>"; };
-               F4B414F618B1D35800468DAF /* HMMasterMissionCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMasterMissionCommand.h; sourceTree = "<group>"; };
-               F4B414F718B1D35800468DAF /* HMMasterMissionCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMasterMissionCommand.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; };
@@ -818,8 +817,7 @@
                                F4B414F118B1013C00468DAF /* HMMasterSlotItemCommand.m */,
                                F4B414F318B1888800468DAF /* HMMasterFurnitureCommand.h */,
                                F4B414F418B1888800468DAF /* HMMasterFurnitureCommand.m */,
-                               F4B414F618B1D35800468DAF /* HMMasterMissionCommand.h */,
-                               F4B414F718B1D35800468DAF /* HMMasterMissionCommand.m */,
+                               F44BC7201E29E82B004644E3 /* HMMasterMissionCommand.swift */,
                                F44BC71E1E29E740004644E3 /* HMMasterSlotItemEquipTypeCommand.swift */,
                        );
                        name = MasterUpdateCommand;
@@ -1694,7 +1692,6 @@
                                F44BC6C11E221293004644E3 /* HMAirCorpsChangeNameCommand.swift in Sources */,
                                F490978B1E1B38F00085A45D /* HMTiledImageView.swift in Sources */,
                                F48A705C1DE58A38005DFC0B /* HMKCAirBase+CoreDataClass.m in Sources */,
-                               F4B414F818B1D35800468DAF /* HMMasterMissionCommand.m in Sources */,
                                F44BC6F51E23D593004644E3 /* HMPowerUpCommand.swift in Sources */,
                                F45F3BE31E06A60A0009434E /* HMUpgradableShipsWindowController.swift in Sources */,
                                F4E5FF121E17D6850026868C /* HMGameViewController.swift in Sources */,
@@ -1758,6 +1755,7 @@
                                F4D05BD71E0F696C00688D66 /* HMRepairListViewController.swift in Sources */,
                                F44BC7191E29D9DC004644E3 /* HMMemberDeckCommand.swift in Sources */,
                                F490977F1E19ED400085A45D /* HMStrengthenListItemView.swift in Sources */,
+                               F44BC7211E29E82B004644E3 /* HMMasterMissionCommand.swift in Sources */,
                                F4B15CBD1E21BA870078CFFC /* CommandRegister.swift in Sources */,
                                F4F6E82B1B3045970008B66E /* CustomHTTPProtocol.m in Sources */,
                                F4513EDD18B619B600073552 /* HMCoreDataManager.m in Sources */,

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

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

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

diff --git a/KCD/HMStart2Command.m b/KCD/HMStart2Command.m
index 113f7fc..1fe5ece 100644 (file)
--- a/KCD/HMStart2Command.m
+++ b/KCD/HMStart2Command.m
@@ -14,7 +14,6 @@
 #import "HMMasterMapInfoCommand.h"
 #import "HMMasterSTypeCommand.h"
 #import "HMMaserShipCommand.h"
-#import "HMMasterMissionCommand.h"
 #import "HMMasterFurnitureCommand.h"
 #import "HMMasterSlotItemCommand.h"
 #import "HMMasterUseItemCommand.h"