containsを多用するArrayのうちSetに置換可能なものをSetに変更

diff --git a/KCD/AnchorageRepairManager.swift b/KCD/AnchorageRepairManager.swift
index 68832c4..37fa22f 100644 (file)
--- a/KCD/AnchorageRepairManager.swift
+++ b/KCD/AnchorageRepairManager.swift
@@ -14,7 +14,7 @@ final class AnchorageRepairManager: NSObject {
     static let `default`: AnchorageRepairManager = AnchorageRepairManager()
     
     private let fleetManager = AppDelegate.shared.fleetManager
     static let `default`: AnchorageRepairManager = AnchorageRepairManager()
     
     private let fleetManager = AppDelegate.shared.fleetManager

-    private let repairShipTypeIds: [Int] = [19]
+    private let repairShipTypeIds: Set<Int> = [19]

     
     override init() {
                 
     
     override init() {
                 

diff --git a/KCD/JSONMapper.swift b/KCD/JSONMapper.swift
index 5ab7d34..0536b8b 100644 (file)
--- a/KCD/JSONMapper.swift
+++ b/KCD/JSONMapper.swift
@@ -16,13 +16,13 @@ struct MappingConfiguration<T: Entity> {
     let dataKeys: [String]
     let primaryKeys: [String]
     let editorStore: CoreDataAccessor
     let dataKeys: [String]
     let primaryKeys: [String]
     let editorStore: CoreDataAccessor

-    let ignoreKeys: [String]
+    let ignoreKeys: Set<String>

     
     init(entity: T.Type,
          dataKeys: [String] = ["api_data"],
          primaryKeys: [String] = ["id"],
          editorStore: CoreDataAccessor,
     
     init(entity: T.Type,
          dataKeys: [String] = ["api_data"],
          primaryKeys: [String] = ["id"],
          editorStore: CoreDataAccessor,

-         ignoreKeys: [String] = []) {
+         ignoreKeys: Set<String> = []) {

         
         self.entity = entity
         self.dataKeys = dataKeys
         
         self.entity = entity
         self.dataKeys = dataKeys

diff --git a/KCD/KCManagedObject.swift b/KCD/KCManagedObject.swift
index e669ea4..a704340 100644 (file)
--- a/KCD/KCManagedObject.swift
+++ b/KCD/KCManagedObject.swift
@@ -17,15 +17,7 @@ enum KCManagedObjectError: Error {
 
 class KCManagedObject: NSManagedObject {
     
 
 class KCManagedObject: NSManagedObject {
     

-    private static let intValueKyes =
-        [
-    "api_enqflg", "api_aftershipid", "api_progress", "api_usebull",
-    "api_flagship", "api_name_id",
-    "api_comment_id", "api_nickname_id", "api_member_id",
-    "api_flag_0", "api_flag_1", "api_flag_2", "api_flag_3", "api_flag_4",
-    "api_flag_5", "api_flag_6", "api_flag_7",
-    "api_level"
-    ]
+    private static let intValueKyes: Set<String> = ["api_aftershipid", "api_level"]

     
     override func validateValue(_ value: AutoreleasingUnsafeMutablePointer<AnyObject?>, forKey key: String) throws {
         
     
     override func validateValue(_ value: AutoreleasingUnsafeMutablePointer<AnyObject?>, forKey key: String) throws {
         

diff --git a/KCD/ShipMapper.swift b/KCD/ShipMapper.swift
index c03e83c..64398df 100644 (file)
--- a/KCD/ShipMapper.swift
+++ b/KCD/ShipMapper.swift
@@ -11,14 +11,14 @@ import SwiftyJSON
 
 final class ShipMapper: JSONMapper {
     
 
 final class ShipMapper: JSONMapper {
     

-    private static let ignoreKeys = ["api_gomes", "api_gomes2", "api_broken", "api_powup",
-                                     "api_voicef", "api_afterlv", "api_aftershipid", "api_backs",
-                                     "api_slotnum", "api_stype", "api_name", "api_yomi",
-                                     "api_raig", "api_luck", "api_saku", "api_raim", "api_baku",
-                                     "api_taik", "api_houg", "api_houm", "api_tyku",
-                                     "api_ndock_item", "api_star",
-                                     "api_ndock_time_str", "api_member_id",
-                                     "api_fuel_max", "api_bull_max"]
+    private static let ignoreKeys: Set<String> = ["api_gomes", "api_gomes2", "api_broken", "api_powup",
+                                                  "api_voicef", "api_afterlv", "api_aftershipid", "api_backs",
+                                                  "api_slotnum", "api_stype", "api_name", "api_yomi",
+                                                  "api_raig", "api_luck", "api_saku", "api_raim", "api_baku",
+                                                  "api_taik", "api_houg", "api_houm", "api_tyku",
+                                                  "api_ndock_item", "api_star",
+                                                  "api_ndock_time_str", "api_member_id",
+                                                  "api_fuel_max", "api_bull_max"]

     
     let apiResponse: APIResponse
     let configuration: MappingConfiguration<Ship>
     
     let apiResponse: APIResponse
     let configuration: MappingConfiguration<Ship>