HMActinKindTransformerをSwiftに変換した

diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj
index e0b672f..b38853a 100644 (file)
--- a/KCD.xcodeproj/project.pbxproj
+++ b/KCD.xcodeproj/project.pbxproj
@@ -34,7 +34,6 @@
                F4268031194D1B1A00B2C27F /* HMChangeHenseiCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4268030194D1B1A00B2C27F /* HMChangeHenseiCommand.m */; };
                F4268034195332A000B2C27F /* HMPowerUpCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4268033195332A000B2C27F /* HMPowerUpCommand.m */; };
                F431E9761DF3AC1C00FB56AE /* HMSetActionCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F431E9751DF3AC1C00FB56AE /* HMSetActionCommand.m */; };
-               F431E9791DF3CD1B00FB56AE /* HMActinKindTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = F431E9781DF3CD1B00FB56AE /* HMActinKindTransformer.m */; };
                F431E97C1DF3D2E100FB56AE /* HMAreaNameTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = F431E97B1DF3D2E100FB56AE /* HMAreaNameTransformer.m */; };
                F431E97F1DF3D8CC00FB56AE /* HMAirCorpsChangeNameCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F431E97E1DF3D8CC00FB56AE /* HMAirCorpsChangeNameCommand.m */; };
                F43769D61ADE86B200DE6204 /* HMQuestListCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F43769D51ADE86B200DE6204 /* HMQuestListCommand.m */; };
@@ -155,6 +154,7 @@
                F4AA593E1E1E0BFB001667AF /* HMDamageValueTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AA593D1E1E0BFB001667AF /* HMDamageValueTransformer.swift */; };
                F4AA59401E1E23EC001667AF /* HMHistoryMarkTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AA593F1E1E23EC001667AF /* HMHistoryMarkTransformer.swift */; };
                F4AA59421E1E2854001667AF /* HMOrderedSetToArrayTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AA59411E1E2854001667AF /* HMOrderedSetToArrayTransformer.swift */; };
+               F4AA59441E1E300B001667AF /* HMActinKindTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AA59431E1E300B001667AF /* HMActinKindTransformer.swift */; };
                F4AC136D1E0802C000851147 /* HMPreferencePanelController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AC136C1E0802C000851147 /* HMPreferencePanelController.swift */; };
                F4AC136F1E0963DB00851147 /* HMProgressPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AC136E1E0963DB00851147 /* HMProgressPanel.swift */; };
                F4AC13711E096A7B00851147 /* HMHistoryWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AC13701E096A7B00851147 /* HMHistoryWindowController.swift */; };
@@ -370,8 +370,6 @@
                F42CBB201D1ED41D004C2AE2 /* LocalData 3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "LocalData 3.xcdatamodel"; sourceTree = "<group>"; };
                F431E9741DF3AC1C00FB56AE /* HMSetActionCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMSetActionCommand.h; sourceTree = "<group>"; };
                F431E9751DF3AC1C00FB56AE /* HMSetActionCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMSetActionCommand.m; sourceTree = "<group>"; };
-               F431E9771DF3CD1B00FB56AE /* HMActinKindTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMActinKindTransformer.h; sourceTree = "<group>"; };
-               F431E9781DF3CD1B00FB56AE /* HMActinKindTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMActinKindTransformer.m; sourceTree = "<group>"; };
                F431E97A1DF3D2E100FB56AE /* HMAreaNameTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMAreaNameTransformer.h; sourceTree = "<group>"; };
                F431E97B1DF3D2E100FB56AE /* HMAreaNameTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMAreaNameTransformer.m; sourceTree = "<group>"; };
                F431E97D1DF3D8CC00FB56AE /* HMAirCorpsChangeNameCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMAirCorpsChangeNameCommand.h; sourceTree = "<group>"; };
@@ -572,6 +570,7 @@
                F4AA593D1E1E0BFB001667AF /* HMDamageValueTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMDamageValueTransformer.swift; sourceTree = "<group>"; };
                F4AA593F1E1E23EC001667AF /* HMHistoryMarkTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMHistoryMarkTransformer.swift; sourceTree = "<group>"; };
                F4AA59411E1E2854001667AF /* HMOrderedSetToArrayTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMOrderedSetToArrayTransformer.swift; sourceTree = "<group>"; };
+               F4AA59431E1E300B001667AF /* HMActinKindTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMActinKindTransformer.swift; sourceTree = "<group>"; };
                F4AC136C1E0802C000851147 /* HMPreferencePanelController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMPreferencePanelController.swift; sourceTree = "<group>"; };
                F4AC136E1E0963DB00851147 /* HMProgressPanel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMProgressPanel.swift; sourceTree = "<group>"; };
                F4AC13701E096A7B00851147 /* HMHistoryWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMHistoryWindowController.swift; sourceTree = "<group>"; };
@@ -1281,8 +1280,7 @@
                                F4AA593D1E1E0BFB001667AF /* HMDamageValueTransformer.swift */,
                                F4AA593F1E1E23EC001667AF /* HMHistoryMarkTransformer.swift */,
                                F4AA59411E1E2854001667AF /* HMOrderedSetToArrayTransformer.swift */,
-                               F431E9771DF3CD1B00FB56AE /* HMActinKindTransformer.h */,
-                               F431E9781DF3CD1B00FB56AE /* HMActinKindTransformer.m */,
+                               F4AA59431E1E300B001667AF /* HMActinKindTransformer.swift */,
                                F431E97A1DF3D2E100FB56AE /* HMAreaNameTransformer.h */,
                                F431E97B1DF3D2E100FB56AE /* HMAreaNameTransformer.m */,
                                F42185021DF43D0700256590 /* HMAirbasePlaneStateTransformer.h */,
@@ -1743,7 +1741,6 @@
                                F4513EE818B77A5300073552 /* HMMemberKDockCommand.m in Sources */,
                                F4F9F87E1C6B5E4A00D0EE76 /* HMKCMasterSType.m in Sources */,
                                F4AA59251E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataClass.m in Sources */,
-                               F431E9791DF3CD1B00FB56AE /* HMActinKindTransformer.m in Sources */,
                                F4048A9F1E19308A008ACFD6 /* HMStrokeTextFieldCell.swift in Sources */,
                                F45F3BE11E067A870009434E /* HMHistoryItemCleaner.swift in Sources */,
                                F4E5FF0C1E1645280026868C /* HMScreenshotListViewController.swift in Sources */,
@@ -1851,6 +1848,7 @@
                                F42185041DF43D0700256590 /* HMAirbasePlaneStateTransformer.m in Sources */,
                                F46F45BF1CFF0BEE00EB7F4D /* HMSlotDepriveCommand.m in Sources */,
                                F46F45C21CFF0CFF00EB7F4D /* HMSlotDepriveUnsetCommand.m in Sources */,
+                               F4AA59441E1E300B001667AF /* HMActinKindTransformer.swift in Sources */,
                                F4D05BCC1E0D274100688D66 /* HMBookmarkEditorViewController.swift in Sources */,
                                F494DC6D18CC054800AE97E4 /* HMNyukyoDockStatus.m in Sources */,
                                F4666C641B25CA3E001840DB /* HMKCQuest+Extensions.m in Sources */,

diff --git a/KCD/HMActinKindTransformer.h b/KCD/HMActinKindTransformer.h
deleted file mode 100644 (file)
index 6b72643..0000000
--- a/KCD/HMActinKindTransformer.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  HMActinKindTransformer.h
-//  KCD
-//
-//  Created by Hori,Masaki on 2016/12/04.
-//  Copyright © 2016年 Hori,Masaki. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface HMActinKindTransformer : NSValueTransformer
-
-@end

diff --git a/KCD/HMActinKindTransformer.m b/KCD/HMActinKindTransformer.m
deleted file mode 100644 (file)
index 380688f..0000000
--- a/KCD/HMActinKindTransformer.m
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-//  HMActinKindTransformer.m
-//  KCD
-//
-//  Created by Hori,Masaki on 2016/12/04.
-//  Copyright © 2016年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMActinKindTransformer.h"
-
-typedef NS_ENUM(NSUInteger, HMActionKind) {
-    standBy,
-    sortie,
-    airDifence,
-    shelter,
-    rest,
-};
-
-@implementation HMActinKindTransformer
-//+ (void)load
-//{
-//    static dispatch_once_t onceToken;
-//    dispatch_once(&onceToken, ^{
-//        [NSValueTransformer setValueTransformer:[self new] forName:@"HMActinKindTransformer"];
-//    });
-//}
-+ (Class)transformedValueClass
-{
-    return [NSString class];
-}
-+ (BOOL)allowsReverseTransformation
-{
-    return NO;
-}
-
-- (id)transformedValue:(id)value
-{
-    HMActionKind actionKind = [value doubleValue];
-    NSString *name = nil;
-    
-    switch(actionKind) {
-        case standBy:
-            name = NSLocalizedString(@"StandBy", @"Airbase action kind");
-            break;
-        case sortie:
-            name = NSLocalizedString(@"Sortie", @"Airbase action kind");
-            break;
-        case airDifence:
-            name = NSLocalizedString(@"Air Difence", @"Airbase action kind");
-            break;
-        case shelter:
-            name = NSLocalizedString(@"Shelter", @"Airbase action kind");
-            break;
-        case rest:
-            name = NSLocalizedString(@"Rest", @"Airbase action kind");
-            break;
-    }
-    
-    return name;
-}
-@end

diff --git a/KCD/HMActinKindTransformer.swift b/KCD/HMActinKindTransformer.swift
new file mode 100644 (file)
index 0000000..d60c734
--- /dev/null
+++ b/KCD/HMActinKindTransformer.swift
@@ -0,0 +1,39 @@
+//
+//  HMActinKindTransformer.swift
+//  KCD
+//
+//  Created by Hori,Masaki on 2017/01/05.
+//  Copyright © 2017年 Hori,Masaki. All rights reserved.
+//
+
+import Cocoa
+
+fileprivate enum AirBaseActionKind: Int {
+    case standBy
+    case sortie
+    case airDifence
+    case shelter
+    case rest
+}
+
+class HMActinKindTransformer: ValueTransformer {
+    override class func transformedValueClass() -> Swift.AnyClass {
+        return String.self as! AnyClass
+    }
+    override func transformedValue(_ value: Any?) -> Any? {
+        guard let v = value as? Int,
+            let type = AirBaseActionKind(rawValue: v) else { return nil }
+        switch type {
+        case .standBy:
+            return NSLocalizedString("StandBy", comment: "Airbase action kind")
+        case .sortie:
+            return NSLocalizedString("Sortie", comment: "Airbase action kind")
+        case .airDifence:
+            return NSLocalizedString("Air Difence", comment: "Airbase action kind")
+        case .shelter:
+            return NSLocalizedString("Shelter", comment: "Airbase action kind")
+        case .rest:
+            return NSLocalizedString("Rest", comment: "Airbase action kind")
+        }
+    }
+}

diff --git a/KCD/KCD-Bridging-Header.h b/KCD/KCD-Bridging-Header.h
index 25ce34a..e03c9ef 100644 (file)
--- a/KCD/KCD-Bridging-Header.h
+++ b/KCD/KCD-Bridging-Header.h
@@ -6,7 +6,6 @@
 #import "HMUserDefaults.h"
 
 // ValueTransformer
-#import "HMActinKindTransformer.h"
 #import "HMAreaNameTransformer.h"
 #import "HMAirbasePlaneStateTransformer.h"