From 42a7bf2f0d099044d8672a79d6ee855b59ce46ca Mon Sep 17 00:00:00 2001 From: masakih Date: Sun, 11 Jan 2015 21:57:39 +0900 Subject: [PATCH] =?utf8?q?HMMasterMapAreaCommand=E3=82=AF=E3=83=A9?= =?utf8?q?=E3=82=B9=E3=82=92Swift=E3=81=A6=E3=82=99=E6=9B=B8=E3=81=8D?= =?utf8?q?=E6=8F=9B=E3=81=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- KCD.xcodeproj/project.pbxproj | 10 ++++------ KCD/HMCompositMapCommand.m | 1 - KCD/HMMasterMapAreaCommand.h | 13 ------------- KCD/HMMasterMapAreaCommand.m | 20 -------------------- KCD/HMMasterMapAreaCommand.swift | 18 ++++++++++++++++++ 5 files changed, 22 insertions(+), 40 deletions(-) delete mode 100644 KCD/HMMasterMapAreaCommand.h delete mode 100644 KCD/HMMasterMapAreaCommand.m create mode 100644 KCD/HMMasterMapAreaCommand.swift diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj index 5fc9dbd2..e69c2f98 100644 --- a/KCD.xcodeproj/project.pbxproj +++ b/KCD.xcodeproj/project.pbxproj @@ -70,6 +70,7 @@ F47C5C0E1A620E4200C276B5 /* HMMasterUseItemCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F47C5C0D1A620E4200C276B5 /* HMMasterUseItemCommand.swift */; }; F47C5C101A62191E00C276B5 /* HMMasterMapCellCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F47C5C0F1A62191E00C276B5 /* HMMasterMapCellCommand.swift */; }; F47C5C121A62304F00C276B5 /* HMMasterMapInfoCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F47C5C111A62304F00C276B5 /* HMMasterMapInfoCommand.swift */; }; + F47C5C141A6282BD00C276B5 /* HMMasterMapAreaCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F47C5C131A6282BD00C276B5 /* HMMasterMapAreaCommand.swift */; }; F48F7B021907D7B800E78AE1 /* HMPortCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F48F7B011907D7B800E78AE1 /* HMPortCommand.m */; }; F494DC6A18C8BAB900AE97E4 /* HMPowerUpSupportViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F494DC6818C8BAB900AE97E4 /* HMPowerUpSupportViewController.xib */; }; F4A2AF541A074DE40024BD9E /* HMScreenshotListWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4A2AF561A074DE40024BD9E /* HMScreenshotListWindowController.xib */; }; @@ -109,7 +110,6 @@ F4B3DC4C18F0C8A90011B4FC /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F4B3DC4B18F0C8A90011B4FC /* Social.framework */; }; F4B3DC4E18F0C8FF0011B4FC /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F4B3DC4D18F0C8FF0011B4FC /* Accounts.framework */; }; F4B3DC5218F150CD0011B4FC /* HMScreenshotWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B3DC5018F150CD0011B4FC /* HMScreenshotWindowController.m */; }; - F4B414E918B09A4B00468DAF /* HMMasterMapAreaCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B414E818B09A4B00468DAF /* HMMasterMapAreaCommand.m */; }; F4B414F818B1D35800468DAF /* HMMasterMissionCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B414F718B1D35800468DAF /* HMMasterMissionCommand.m */; }; F4BDEB47187252F30069D0CE /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F4BDEB46187252F30069D0CE /* Cocoa.framework */; }; F4BDEB51187252F30069D0CE /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F4BDEB4F187252F30069D0CE /* InfoPlist.strings */; }; @@ -245,6 +245,7 @@ F47C5C0D1A620E4200C276B5 /* HMMasterUseItemCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMMasterUseItemCommand.swift; sourceTree = ""; }; F47C5C0F1A62191E00C276B5 /* HMMasterMapCellCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMMasterMapCellCommand.swift; sourceTree = ""; }; F47C5C111A62304F00C276B5 /* HMMasterMapInfoCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMMasterMapInfoCommand.swift; sourceTree = ""; }; + F47C5C131A6282BD00C276B5 /* HMMasterMapAreaCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMMasterMapAreaCommand.swift; sourceTree = ""; }; F48F7B001907D7B800E78AE1 /* HMPortCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMPortCommand.h; sourceTree = ""; }; F48F7B011907D7B800E78AE1 /* HMPortCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMPortCommand.m; sourceTree = ""; }; F494DC5618C23E4300AE97E4 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/MainMenu.strings; sourceTree = ""; }; @@ -306,8 +307,6 @@ F4B3DC4D18F0C8FF0011B4FC /* Accounts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accounts.framework; path = System/Library/Frameworks/Accounts.framework; sourceTree = SDKROOT; }; F4B3DC4F18F150CD0011B4FC /* HMScreenshotWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMScreenshotWindowController.h; sourceTree = ""; }; F4B3DC5018F150CD0011B4FC /* HMScreenshotWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMScreenshotWindowController.m; sourceTree = ""; }; - F4B414E718B09A4B00468DAF /* HMMasterMapAreaCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMasterMapAreaCommand.h; sourceTree = ""; }; - F4B414E818B09A4B00468DAF /* HMMasterMapAreaCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMasterMapAreaCommand.m; sourceTree = ""; }; F4B414F618B1D35800468DAF /* HMMasterMissionCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMasterMissionCommand.h; sourceTree = ""; }; F4B414F718B1D35800468DAF /* HMMasterMissionCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMasterMissionCommand.m; sourceTree = ""; }; F4BDEB43187252F30069D0CE /* KCD.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = KCD.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -604,8 +603,7 @@ F4D2CBC118AD0E1A000EBC59 /* HMMasterSTypeCommand.m */, F4D2CBC918B05E58000EBC59 /* HMMaserShipCommand.h */, F4D2CBCA18B05E58000EBC59 /* HMMaserShipCommand.m */, - F4B414E718B09A4B00468DAF /* HMMasterMapAreaCommand.h */, - F4B414E818B09A4B00468DAF /* HMMasterMapAreaCommand.m */, + F47C5C131A6282BD00C276B5 /* HMMasterMapAreaCommand.swift */, F47C5C111A62304F00C276B5 /* HMMasterMapInfoCommand.swift */, F47C5C0F1A62191E00C276B5 /* HMMasterMapCellCommand.swift */, F47C5C0D1A620E4200C276B5 /* HMMasterUseItemCommand.swift */, @@ -907,7 +905,6 @@ F4B3DC4718EEEB920011B4FC /* HMCompositMapCommand.m in Sources */, F4B3DBCA18DDB9170011B4FC /* HMCreateSlotItemCommand.m in Sources */, F4131ED8190FA08D004F7F9A /* HMDestroyItem2Command.m in Sources */, - F4B414E918B09A4B00468DAF /* HMMasterMapAreaCommand.m in Sources */, F4C118FB18A67B1C005D5B25 /* CanonicalRequest.m in Sources */, F477E23F1A530C3800493198 /* HMKCDeck.swift in Sources */, F47C5C081A616E8700C276B5 /* HMMemberDeckCommand.swift in Sources */, @@ -931,6 +928,7 @@ F4551BE41A48379F00BB0235 /* HMDeckViewController.swift in Sources */, F4551BF21A49490A00BB0235 /* HMDocksViewController.swift in Sources */, F4B30CF31A458AF2008E3D79 /* HMSlotItemWindowController.swift in Sources */, + F47C5C141A6282BD00C276B5 /* HMMasterMapAreaCommand.swift in Sources */, F43BA4A4197BE6C200CFF788 /* HMRealDestroyShipCommand.m in Sources */, F4B37EF619FBE801002F371A /* HMRemodelSlotItemCommand.m in Sources */, F4513EF318B991F800073552 /* HMMemberBasicCommand.m in Sources */, diff --git a/KCD/HMCompositMapCommand.m b/KCD/HMCompositMapCommand.m index 9db71480..ee69b221 100644 --- a/KCD/HMCompositMapCommand.m +++ b/KCD/HMCompositMapCommand.m @@ -8,7 +8,6 @@ #import "HMCompositMapCommand.h" -#import "HMMasterMapAreaCommand.h" #import "HMMasterSTypeCommand.h" #import "HMMaserShipCommand.h" #import "HMMasterMissionCommand.h" diff --git a/KCD/HMMasterMapAreaCommand.h b/KCD/HMMasterMapAreaCommand.h deleted file mode 100644 index c82648b6..00000000 --- a/KCD/HMMasterMapAreaCommand.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// HMMasterMapAreaCommand.h -// KCD -// -// Created by Hori,Masaki on 2014/02/16. -// Copyright (c) 2014å¹´ Hori,Masaki. All rights reserved. -// - -#import "HMJSONCommand.h" - -@interface HMMasterMapAreaCommand : HMJSONCommand - -@end diff --git a/KCD/HMMasterMapAreaCommand.m b/KCD/HMMasterMapAreaCommand.m deleted file mode 100644 index af092b97..00000000 --- a/KCD/HMMasterMapAreaCommand.m +++ /dev/null @@ -1,20 +0,0 @@ -// -// HMMasterMapAreaCommand.m -// KCD -// -// Created by Hori,Masaki on 2014/02/16. -// Copyright (c) 2014å¹´ Hori,Masaki. All rights reserved. -// - -#import "HMMasterMapAreaCommand.h" - -@implementation HMMasterMapAreaCommand -- (NSString *)dataKey -{ - return @"api_data.api_mst_maparea"; -} -- (void)execute -{ - [self commitJSONToEntityNamed:@"MasterMapArea"]; -} -@end diff --git a/KCD/HMMasterMapAreaCommand.swift b/KCD/HMMasterMapAreaCommand.swift new file mode 100644 index 00000000..5d2155ad --- /dev/null +++ b/KCD/HMMasterMapAreaCommand.swift @@ -0,0 +1,18 @@ +// +// HMMasterMapAreaCommand.swift +// KCD +// +// Created by Hori,Masaki on 2015/01/11. +// Copyright (c) 2015å¹´ Hori,Masaki. All rights reserved. +// + +import Cocoa + +class HMMasterMapAreaCommand: HMJSONCommand { + override var dataKey: String { + return "api_data.api_mst_maparea" + } + override func execute() { + super.commitJSONToEntityNamed("MasterMapArea") + } +} -- 2.11.0