HMMasterMapInfoCommandをSwiftに変換した

diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj
index 400dba3..05d3bc5 100644 (file)
--- a/KCD.xcodeproj/project.pbxproj
+++ b/KCD.xcodeproj/project.pbxproj
@@ -85,6 +85,7 @@
                F44BC7251E29EC26004644E3 /* HMMasterSlotItemCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44BC7241E29EC26004644E3 /* HMMasterSlotItemCommand.swift */; };
                F44BC7271E29ED87004644E3 /* HMMasterUseItemCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44BC7261E29ED87004644E3 /* HMMasterUseItemCommand.swift */; };
                F44BC7291E2A0842004644E3 /* HMMasterMapCellCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44BC7281E2A0842004644E3 /* HMMasterMapCellCommand.swift */; };
+               F44BC72B1E2A09B9004644E3 /* HMMasterMapInfoCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44BC72A1E2A09B9004644E3 /* HMMasterMapInfoCommand.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 */; };
@@ -197,7 +198,6 @@
                F4B3DC4C18F0C8A90011B4FC /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F4B3DC4B18F0C8A90011B4FC /* Social.framework */; };
                F4B3DC4E18F0C8FF0011B4FC /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F4B3DC4D18F0C8FF0011B4FC /* Accounts.framework */; };
                F4B414E918B09A4B00468DAF /* HMMasterMapAreaCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B414E818B09A4B00468DAF /* HMMasterMapAreaCommand.m */; };
-               F4B414EF18B0BF1A00468DAF /* HMMasterMapInfoCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B414EE18B0BF1A00468DAF /* HMMasterMapInfoCommand.m */; };
                F4BDEB47187252F30069D0CE /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F4BDEB46187252F30069D0CE /* Cocoa.framework */; };
                F4BDEB51187252F30069D0CE /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F4BDEB4F187252F30069D0CE /* InfoPlist.strings */; };
                F4BDEB53187252F30069D0CE /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F4BDEB52187252F30069D0CE /* main.m */; };
@@ -418,6 +418,7 @@
                F44BC7241E29EC26004644E3 /* HMMasterSlotItemCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMMasterSlotItemCommand.swift; sourceTree = "<group>"; };
                F44BC7261E29ED87004644E3 /* HMMasterUseItemCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMMasterUseItemCommand.swift; sourceTree = "<group>"; };
                F44BC7281E2A0842004644E3 /* HMMasterMapCellCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMMasterMapCellCommand.swift; sourceTree = "<group>"; };
+               F44BC72A1E2A09B9004644E3 /* HMMasterMapInfoCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMMasterMapInfoCommand.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>"; };
@@ -569,8 +570,6 @@
                F4B3DC4D18F0C8FF0011B4FC /* Accounts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accounts.framework; path = System/Library/Frameworks/Accounts.framework; sourceTree = SDKROOT; };
                F4B414E718B09A4B00468DAF /* HMMasterMapAreaCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMasterMapAreaCommand.h; sourceTree = "<group>"; };
                F4B414E818B09A4B00468DAF /* HMMasterMapAreaCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMasterMapAreaCommand.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>"; };
                F4BDEB43187252F30069D0CE /* KCD.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = KCD.app; sourceTree = BUILT_PRODUCTS_DIR; };
                F4BDEB46187252F30069D0CE /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
                F4BDEB49187252F30069D0CE /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -803,8 +802,7 @@
                                F4D2CBCA18B05E58000EBC59 /* HMMaserShipCommand.m */,
                                F4B414E718B09A4B00468DAF /* HMMasterMapAreaCommand.h */,
                                F4B414E818B09A4B00468DAF /* HMMasterMapAreaCommand.m */,
-                               F4B414ED18B0BF1A00468DAF /* HMMasterMapInfoCommand.h */,
-                               F4B414EE18B0BF1A00468DAF /* HMMasterMapInfoCommand.m */,
+                               F44BC72A1E2A09B9004644E3 /* HMMasterMapInfoCommand.swift */,
                                F44BC7281E2A0842004644E3 /* HMMasterMapCellCommand.swift */,
                                F44BC7261E29ED87004644E3 /* HMMasterUseItemCommand.swift */,
                                F44BC7241E29EC26004644E3 /* HMMasterSlotItemCommand.swift */,
@@ -1719,7 +1717,6 @@
                                F4D05BCC1E0D274100688D66 /* HMBookmarkEditorViewController.swift in Sources */,
                                F494DC6D18CC054800AE97E4 /* HMNyukyoDockStatus.m in Sources */,
                                F4666C641B25CA3E001840DB /* HMKCQuest+Extensions.m in Sources */,
-                               F4B414EF18B0BF1A00468DAF /* HMMasterMapInfoCommand.m in Sources */,
                                F4B3DC1B18DEAB5E0011B4FC /* HMKaihatuHistory.m in Sources */,
                                F49097871E1A85F70085A45D /* HMImageView.swift in Sources */,
                                F4D05BC61E0ABD6800688D66 /* HMSlotItemWindowController.swift in Sources */,
@@ -1756,6 +1753,7 @@
                                F45FBB921E129BAE000E72B9 /* HMFleetViewController.swift in Sources */,
                                F48A705E1DE58A38005DFC0B /* HMKCAirBasePlaneInfo+CoreDataClass.m in Sources */,
                                F4AA59501E1E4D18001667AF /* HMShipWindowController.swift in Sources */,
+                               F44BC72B1E2A09B9004644E3 /* HMMasterMapInfoCommand.swift in Sources */,
                                F4B3DC2718DF2F360011B4FC /* HMKenzoMark.m in Sources */,
                                F4AA594C1E1E497C001667AF /* HMEquipmentWindowController.swift in Sources */,
                                F4D05BCA1E0CADA100688D66 /* HMExternalBrowserWindowController.swift in Sources */,

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

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

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

diff --git a/KCD/HMStart2Command.m b/KCD/HMStart2Command.m
index cbe8770..65dab3d 100644 (file)
--- a/KCD/HMStart2Command.m
+++ b/KCD/HMStart2Command.m
@@ -11,7 +11,6 @@
 #import "KCD-Swift.h"
 
 #import "HMMasterMapAreaCommand.h"
-#import "HMMasterMapInfoCommand.h"
 #import "HMMasterSTypeCommand.h"
 #import "HMMaserShipCommand.h"