HMAirBattleCommandをSwiftに変換した

diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj
index 5ea76e8..6cfcfbf 100644 (file)
--- a/KCD.xcodeproj/project.pbxproj
+++ b/KCD.xcodeproj/project.pbxproj
@@ -19,7 +19,6 @@
                F42185111DF461A600256590 /* HMScreenshotTouchBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = F42185101DF461A600256590 /* HMScreenshotTouchBar.xib */; };
                F4268009193AF4E000B2C27F /* HMUserDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = F4268008193AF4E000B2C27F /* HMUserDefaults.m */; };
                F42680121943E92D00B2C27F /* HMKCShipObject+Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = F42680111943E92D00B2C27F /* HMKCShipObject+Extensions.m */; };
-               F43769DE1AE1248800DE6204 /* HMAirBattleCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F43769DD1AE1248800DE6204 /* HMAirBattleCommand.m */; };
                F43769E71AE7D22700DE6204 /* HMKCQuest.m in Sources */ = {isa = PBXBuildFile; fileRef = F43769E61AE7D22700DE6204 /* HMKCQuest.m */; };
                F43E67B718BE02A10087E5B6 /* STypeShortName.plist in Resources */ = {isa = PBXBuildFile; fileRef = F43E67B618BE02A10087E5B6 /* STypeShortName.plist */; };
                F43E67B918BE060E0087E5B6 /* LevelUpExp.plist in Resources */ = {isa = PBXBuildFile; fileRef = F43E67B818BE060E0087E5B6 /* LevelUpExp.plist */; };
@@ -146,6 +145,7 @@
                F49AABF21DFD53A300E0B24F /* SlotItemWindowTouchBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = F49AABF11DFD53A300E0B24F /* SlotItemWindowTouchBar.xib */; };
                F4A0D7071E2B9FC000224DCE /* HMResetSortieCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4A0D7061E2B9FC000224DCE /* HMResetSortieCommand.swift */; };
                F4A0D7091E2BA2F300224DCE /* HMCalculateDamageCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4A0D7081E2BA2F300224DCE /* HMCalculateDamageCommand.swift */; };
+               F4A0D70B1E2FA26900224DCE /* HMAirBattleCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4A0D70A1E2FA26900224DCE /* HMAirBattleCommand.swift */; };
                F4A2AF581A0930160024BD9E /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F4A2AF571A0930160024BD9E /* Quartz.framework */; };
                F4A2AF5B1A0F9B490024BD9E /* HMScreenshotInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = F4A2AF5A1A0F9B490024BD9E /* HMScreenshotInformation.m */; };
                F4A3AD82199F529700FDBF80 /* HMCombinedBattleCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4A3AD81199F529700FDBF80 /* HMCombinedBattleCommand.m */; };
@@ -338,8 +338,6 @@
                F42680101943E92D00B2C27F /* HMKCShipObject+Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "HMKCShipObject+Extensions.h"; sourceTree = "<group>"; };
                F42680111943E92D00B2C27F /* HMKCShipObject+Extensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "HMKCShipObject+Extensions.m"; sourceTree = "<group>"; };
                F42CBB201D1ED41D004C2AE2 /* LocalData 3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "LocalData 3.xcdatamodel"; sourceTree = "<group>"; };
-               F43769DC1AE1248800DE6204 /* HMAirBattleCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMAirBattleCommand.h; sourceTree = "<group>"; };
-               F43769DD1AE1248800DE6204 /* HMAirBattleCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMAirBattleCommand.m; sourceTree = "<group>"; };
                F43769E51AE7D22700DE6204 /* HMKCQuest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMKCQuest.h; sourceTree = "<group>"; };
                F43769E61AE7D22700DE6204 /* HMKCQuest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMKCQuest.m; sourceTree = "<group>"; };
                F43E67B618BE02A10087E5B6 /* STypeShortName.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = STypeShortName.plist; sourceTree = "<group>"; };
@@ -504,6 +502,7 @@
                F49AABF11DFD53A300E0B24F /* SlotItemWindowTouchBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SlotItemWindowTouchBar.xib; sourceTree = "<group>"; };
                F4A0D7061E2B9FC000224DCE /* HMResetSortieCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMResetSortieCommand.swift; sourceTree = "<group>"; };
                F4A0D7081E2BA2F300224DCE /* HMCalculateDamageCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMCalculateDamageCommand.swift; sourceTree = "<group>"; };
+               F4A0D70A1E2FA26900224DCE /* HMAirBattleCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMAirBattleCommand.swift; sourceTree = "<group>"; };
                F4A2AF571A0930160024BD9E /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = System/Library/Frameworks/Quartz.framework; sourceTree = SDKROOT; };
                F4A2AF591A0F9B490024BD9E /* HMScreenshotInformation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMScreenshotInformation.h; sourceTree = "<group>"; };
                F4A2AF5A1A0F9B490024BD9E /* HMScreenshotInformation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMScreenshotInformation.m; sourceTree = "<group>"; };
@@ -842,8 +841,7 @@
                                F4AA060F1931869E00844688 /* HMBattleResultCommand.m */,
                                F4A3AD80199F529700FDBF80 /* HMCombinedBattleCommand.h */,
                                F4A3AD81199F529700FDBF80 /* HMCombinedBattleCommand.m */,
-                               F43769DC1AE1248800DE6204 /* HMAirBattleCommand.h */,
-                               F43769DD1AE1248800DE6204 /* HMAirBattleCommand.m */,
+                               F4A0D70A1E2FA26900224DCE /* HMAirBattleCommand.swift */,
                                F4A0D7081E2BA2F300224DCE /* HMCalculateDamageCommand.swift */,
                                F4A0D7061E2B9FC000224DCE /* HMResetSortieCommand.swift */,
                                F44BC7401E2B263D004644E3 /* HMGuardShelterCommand.swift */,
@@ -1614,7 +1612,6 @@
                                F44BC6E11E2304E3004644E3 /* HMSlotDepriveUnsetCommand.swift in Sources */,
                                F4A2AF5B1A0F9B490024BD9E /* HMScreenshotInformation.m in Sources */,
                                F44BC73B1E2A5C34004644E3 /* HMMapInfoCommand.swift in Sources */,
-                               F43769DE1AE1248800DE6204 /* HMAirBattleCommand.m in Sources */,
                                F4AA593E1E1E0BFB001667AF /* HMDamageValueTransformer.swift in Sources */,
                                F44BC6E71E231534004644E3 /* HMSlotResetCommand.swift in Sources */,
                                F4AA59321E1D211C001667AF /* HMSlotitemNameTransformer.swift in Sources */,
@@ -1790,6 +1787,7 @@
                                F44AB20019E050F600F217AF /* HMKCDeck.m in Sources */,
                                F43F3D4F1A34ACCD00D6DAF7 /* HMKCShipObject.m in Sources */,
                                F448F9951B70E9BE004901AD /* HMKCMaterial.m in Sources */,
+                               F4A0D70B1E2FA26900224DCE /* HMAirBattleCommand.swift in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

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

diff --git a/KCD/HMAirBattleCommand.m b/KCD/HMAirBattleCommand.m
deleted file mode 100644 (file)
index e78ed82..0000000
--- a/KCD/HMAirBattleCommand.m
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-//  HMAirBattleCommand.m
-//  KCD
-//
-//  Created by Hori,Masaki on 2015/04/17.
-//  Copyright (c) 2015年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMAirBattleCommand.h"
-
-#import "KCD-Swift.h"
-
-
-@implementation HMAirBattleCommand
-//+ (void)load
-//{
-//     static dispatch_once_t onceToken;
-//     dispatch_once(&onceToken, ^{
-//             [HMJSONCommand registerClass:self];
-//     });
-//}
-
-+ (BOOL)canExcuteAPI:(NSString *)api
-{
-       if([api isEqualToString:@"/kcsapi/api_req_sortie/airbattle"]) return YES;
-       if([api isEqualToString:@"/kcsapi/api_req_sortie/ld_airbattle"]) return YES;
-       if([api isEqualToString:@"/kcsapi/api_req_combined_battle/ld_airbattle"]) return YES;
-       
-       return NO;
-}
-
-- (instancetype)initWithAPIResponse:(HMAPIResponse *)apiResponse
-{
-    self = [super initWithAPIResponse:apiResponse
-                          commandList:
-            @[
-              [HMDropShipHistoryCommand commandWithAPIResponse:apiResponse],
-              [HMCalculateDamageCommand commandWithAPIResponse:apiResponse],
-              ]];
-    return self;
-}
-@end

diff --git a/KCD/HMAirBattleCommand.swift b/KCD/HMAirBattleCommand.swift
new file mode 100644 (file)
index 0000000..15ad551
--- /dev/null
+++ b/KCD/HMAirBattleCommand.swift
@@ -0,0 +1,26 @@
+//
+//  HMAirBattleCommand.swift
+//  KCD
+//
+//  Created by Hori,Masaki on 2017/01/18.
+//  Copyright © 2017年 Hori,Masaki. All rights reserved.
+//
+
+import Cocoa
+
+class HMAirBattleCommand: HMCompositCommand {
+    override init(apiResponse: HMAPIResponse) {
+        super.init(apiResponse: apiResponse, commandList:
+            [
+                HMDropShipHistoryCommand(apiResponse: apiResponse),
+                HMCalculateDamageCommand(apiResponse: apiResponse),
+            ]
+        )
+    }
+    override class func canExcuteAPI(_ api: String) -> Bool {
+        if api == "/kcsapi/api_req_sortie/airbattle" { return true }
+        if api == "/kcsapi/api_req_sortie/ld_airbattle" { return true }
+        if api == "/kcsapi/api_req_combined_battle/ld_airbattle" { return true }
+        return false
+    }
+}

diff --git a/KCD/KCD-Bridging-Header.h b/KCD/KCD-Bridging-Header.h
index 0fc8e5a..e8d05fe 100644 (file)
--- a/KCD/KCD-Bridging-Header.h
+++ b/KCD/KCD-Bridging-Header.h
@@ -32,7 +32,6 @@
 #import "HMMidnightBattleCommand.h"
 #import "HMBattleResultCommand.h"
 #import "HMCombinedBattleCommand.h"
-#import "HMAirBattleCommand.h"
 
 // Core Data
 #import "HMBookmarkManager.h"