From 4878fd8917fddbfe847b574be265490ade6868cf Mon Sep 17 00:00:00 2001 From: masakih Date: Sat, 14 Jan 2017 13:55:52 +0900 Subject: [PATCH] =?utf8?q?HMMemberNDockCommand=E3=82=92Swift=E3=81=AB?= =?utf8?q?=E5=A4=89=E6=8F=9B=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- KCD.xcodeproj/project.pbxproj | 10 ++++------ KCD/HMMemberNDockCommand.h | 13 ------------- KCD/HMMemberNDockCommand.m | 36 ------------------------------------ KCD/HMMemberNDockCommand.swift | 26 ++++++++++++++++++++++++++ KCD/KCD-Bridging-Header.h | 1 - 5 files changed, 30 insertions(+), 56 deletions(-) delete mode 100644 KCD/HMMemberNDockCommand.h delete mode 100644 KCD/HMMemberNDockCommand.m create mode 100644 KCD/HMMemberNDockCommand.swift diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj index cd069f89..fcae29cc 100644 --- a/KCD.xcodeproj/project.pbxproj +++ b/KCD.xcodeproj/project.pbxproj @@ -79,6 +79,7 @@ F44BC7171E29AF38004644E3 /* HMMemberMaterialCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44BC7161E29AF38004644E3 /* HMMemberMaterialCommand.swift */; }; F44BC7191E29D9DC004644E3 /* HMMemberDeckCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44BC7181E29D9DC004644E3 /* HMMemberDeckCommand.swift */; }; F44BC71B1E29DCB4004644E3 /* HMMemberKDockCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44BC71A1E29DCB4004644E3 /* HMMemberKDockCommand.swift */; }; + F44BC71D1E29DF32004644E3 /* HMMemberNDockCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44BC71C1E29DF32004644E3 /* HMMemberNDockCommand.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 @@ 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 */; }; - F4B414FE18B3A66200468DAF /* HMMemberNDockCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B414FD18B3A66200468DAF /* HMMemberNDockCommand.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 */; }; @@ -413,6 +413,7 @@ F44BC7161E29AF38004644E3 /* HMMemberMaterialCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMMemberMaterialCommand.swift; sourceTree = ""; }; F44BC7181E29D9DC004644E3 /* HMMemberDeckCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMMemberDeckCommand.swift; sourceTree = ""; }; F44BC71A1E29DCB4004644E3 /* HMMemberKDockCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMMemberKDockCommand.swift; sourceTree = ""; }; + F44BC71C1E29DF32004644E3 /* HMMemberNDockCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMMemberNDockCommand.swift; sourceTree = ""; }; F4513EDB18B619B600073552 /* HMCoreDataManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMCoreDataManager.h; sourceTree = ""; }; F4513EDC18B619B600073552 /* HMCoreDataManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMCoreDataManager.m; sourceTree = ""; }; F45771221E1BCC7C008A9215 /* HMPeriodicNotifier.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMPeriodicNotifier.swift; sourceTree = ""; }; @@ -576,8 +577,6 @@ F4B414F718B1D35800468DAF /* HMMasterMissionCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMasterMissionCommand.m; sourceTree = ""; }; F4B414F918B1FB6C00468DAF /* HMMasterMapCellCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMasterMapCellCommand.h; sourceTree = ""; }; F4B414FA18B1FB6C00468DAF /* HMMasterMapCellCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMasterMapCellCommand.m; sourceTree = ""; }; - F4B414FC18B3A66200468DAF /* HMMemberNDockCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMemberNDockCommand.h; sourceTree = ""; }; - F4B414FD18B3A66200468DAF /* HMMemberNDockCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMemberNDockCommand.m; sourceTree = ""; }; 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; }; @@ -831,8 +830,7 @@ F4649FC11DBBB3410097AEBF /* MemberUpdateCommand */ = { isa = PBXGroup; children = ( - F4B414FC18B3A66200468DAF /* HMMemberNDockCommand.h */, - F4B414FD18B3A66200468DAF /* HMMemberNDockCommand.m */, + F44BC71C1E29DF32004644E3 /* HMMemberNDockCommand.swift */, F44BC71A1E29DCB4004644E3 /* HMMemberKDockCommand.swift */, F44BC7181E29D9DC004644E3 /* HMMemberDeckCommand.swift */, F44BC7161E29AF38004644E3 /* HMMemberMaterialCommand.swift */, @@ -1753,6 +1751,7 @@ F44BC6ED1E238577004644E3 /* HMShipDeckCommand.swift in Sources */, F490978D1E1BA64E0085A45D /* HMGuardEscapedView.swift in Sources */, F43769E71AE7D22700DE6204 /* HMKCQuest.m in Sources */, + F44BC71D1E29DF32004644E3 /* HMMemberNDockCommand.swift in Sources */, F4D05BCE1E0D50D300688D66 /* HMBrowserContentAdjuster.swift in Sources */, F4D05BD01E0D667600688D66 /* HMBookmarkListViewController.swift in Sources */, F4C1190818A746EB005D5B25 /* HMJSONTracker.m in Sources */, @@ -1791,7 +1790,6 @@ F47215A61E1F84B40083D3BC /* HMLocalDataStore.swift in Sources */, F46F104918ABAC910063E503 /* KCD.xcdatamodeld in Sources */, F44BC7111E27C61A004644E3 /* HMMemberSlotItemCommand.swift in Sources */, - F4B414FE18B3A66200468DAF /* HMMemberNDockCommand.m in Sources */, F44BC6FD1E250B2A004644E3 /* HMGetShipCommand.swift in Sources */, F4C2ACA51D7167C2007BFE90 /* HMTimeSignalNotifier.m in Sources */, F4F9F8781C6B5BA900D0EE76 /* HMKCKenzoDock.m in Sources */, diff --git a/KCD/HMMemberNDockCommand.h b/KCD/HMMemberNDockCommand.h deleted file mode 100644 index 09713aec..00000000 --- a/KCD/HMMemberNDockCommand.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// HMMemberNDockCommand.h -// KCD -// -// Created by Hori,Masaki on 2014/02/18. -// Copyright (c) 2014年 Hori,Masaki. All rights reserved. -// - -#import "HMJSONCommand.h" - -@interface HMMemberNDockCommand : HMJSONCommand - -@end diff --git a/KCD/HMMemberNDockCommand.m b/KCD/HMMemberNDockCommand.m deleted file mode 100644 index ac9babca..00000000 --- a/KCD/HMMemberNDockCommand.m +++ /dev/null @@ -1,36 +0,0 @@ -// -// HMMemberNDockCommand.m -// KCD -// -// Created by Hori,Masaki on 2014/02/18. -// Copyright (c) 2014年 Hori,Masaki. All rights reserved. -// - -#import "HMMemberNDockCommand.h" - -@implementation HMMemberNDockCommand -//+ (void)load -//{ -// static dispatch_once_t onceToken; -// dispatch_once(&onceToken, ^{ -// [HMJSONCommand registerClass:self]; -// }); -//} - -+ (BOOL)canExcuteAPI:(NSString *)api -{ - return [api isEqualToString:@"/kcsapi/api_get_member/ndock"]; -} - -- (NSString *)dataKey -{ - if([self.api isEqualToString:@"/kcsapi/api_port/port"]) { - return @"api_data.api_ndock"; - } - return [super dataKey]; -} -- (void)execute -{ - [self commitJSONToEntityNamed:@"NyukyoDock"]; -} -@end diff --git a/KCD/HMMemberNDockCommand.swift b/KCD/HMMemberNDockCommand.swift new file mode 100644 index 00000000..0081d74e --- /dev/null +++ b/KCD/HMMemberNDockCommand.swift @@ -0,0 +1,26 @@ +// +// HMMemberNDockCommand.swift +// KCD +// +// Created by Hori,Masaki on 2017/01/14. +// Copyright © 2017年 Hori,Masaki. All rights reserved. +// + +import Cocoa + +class HMMemberNDockCommand: HMJSONCommand { + override class func canExcuteAPI(_ api: String) -> Bool { + if api == "/kcsapi/api_get_member/ndock" { return true } + return false + } + override var dataKey: String { + if api == "/kcsapi/api_port/port" { + return "api_data.api_ndock" + } + return super.dataKey + } + + override func execute() { + commitJSON(toEntityNamed: "NyukyoDock") + } +} diff --git a/KCD/KCD-Bridging-Header.h b/KCD/KCD-Bridging-Header.h index 33f6ac31..fe7b4d36 100644 --- a/KCD/KCD-Bridging-Header.h +++ b/KCD/KCD-Bridging-Header.h @@ -28,7 +28,6 @@ #import "HMJSONCommand.h" #import "HMStart2Command.h" -#import "HMMemberNDockCommand.h" #import "HMMapStartCommand.h" #import "HMBattleCommand.h" #import "HMMidnightBattleCommand.h" -- 2.11.0