From c9f817bece382c9721769567283fca5b42986888 Mon Sep 17 00:00:00 2001 From: masakih Date: Sun, 21 Dec 2014 13:12:03 +0900 Subject: [PATCH] =?utf8?q?HMSlotItemEquipTypeTransformer=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/HMAppDelegate.m | 1 - KCD/HMSlotItemEquipTypeTransformer.h | 13 --------- KCD/HMSlotItemEquipTypeTransformer.m | 48 -------------------------------- KCD/HMSlotItemEquipTypeTransformer.swift | 47 +++++++++++++++++++++++++++++++ 5 files changed, 51 insertions(+), 68 deletions(-) delete mode 100644 KCD/HMSlotItemEquipTypeTransformer.h delete mode 100644 KCD/HMSlotItemEquipTypeTransformer.m create mode 100644 KCD/HMSlotItemEquipTypeTransformer.swift diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj index b69ce76a..e848eb26 100644 --- a/KCD.xcodeproj/project.pbxproj +++ b/KCD.xcodeproj/project.pbxproj @@ -12,7 +12,6 @@ F4131ED8190FA08D004F7F9A /* HMDestroyItem2Command.m in Sources */ = {isa = PBXBuildFile; fileRef = F4131ED7190FA08D004F7F9A /* HMDestroyItem2Command.m */; }; F4131EDE190FEBDB004F7F9A /* HMSlotItemWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4131EE0190FEBDB004F7F9A /* HMSlotItemWindowController.xib */; }; F4131EE61910318F004F7F9A /* HMMasterSlotItemEquipTypeCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4131EE51910318F004F7F9A /* HMMasterSlotItemEquipTypeCommand.m */; }; - F4131EE91911445F004F7F9A /* HMSlotItemEquipTypeTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = F4131EE81911445F004F7F9A /* HMSlotItemEquipTypeTransformer.m */; }; F4268009193AF4E000B2C27F /* HMUserDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = F4268008193AF4E000B2C27F /* HMUserDefaults.m */; }; F42680121943E92D00B2C27F /* HMKCShipObject+Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = F42680111943E92D00B2C27F /* HMKCShipObject+Extensions.m */; }; F426802B194D0F4800B2C27F /* HMMemberShip2Command.m in Sources */ = {isa = PBXBuildFile; fileRef = F426802A194D0F4800B2C27F /* HMMemberShip2Command.m */; }; @@ -85,6 +84,7 @@ F4B2D03318F83CC800542742 /* HMDeckViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4B2D03518F83CC800542742 /* HMDeckViewController.xib */; }; F4B30CF31A458AF2008E3D79 /* HMSlotItemWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4B30CF11A458AF2008E3D79 /* HMSlotItemWindowController.swift */; }; F4B30CF61A45BABE008E3D79 /* HMUpgradableShipsWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4B30CF51A45BABE008E3D79 /* HMUpgradableShipsWindowController.swift */; }; + F4B30CF81A45DACB008E3D79 /* HMSlotItemEquipTypeTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4B30CF71A45DACB008E3D79 /* HMSlotItemEquipTypeTransformer.swift */; }; F4B37EF019FADFC9002F371A /* HMIgnoreZeroTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B37EEF19FADFC9002F371A /* HMIgnoreZeroTransformer.m */; }; F4B37EF319FBBBED002F371A /* HMRemodelSlotCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B37EF219FBBBED002F371A /* HMRemodelSlotCommand.m */; }; F4B37EF619FBE801002F371A /* HMRemodelSlotItemCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B37EF519FBE801002F371A /* HMRemodelSlotItemCommand.m */; }; @@ -169,8 +169,6 @@ F4131EDF190FEBDB004F7F9A /* ja */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ja; path = ja.lproj/HMSlotItemWindowController.xib; sourceTree = ""; }; F4131EE41910318F004F7F9A /* HMMasterSlotItemEquipTypeCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMasterSlotItemEquipTypeCommand.h; sourceTree = ""; }; F4131EE51910318F004F7F9A /* HMMasterSlotItemEquipTypeCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMasterSlotItemEquipTypeCommand.m; sourceTree = ""; }; - F4131EE71911445F004F7F9A /* HMSlotItemEquipTypeTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMSlotItemEquipTypeTransformer.h; sourceTree = ""; }; - F4131EE81911445F004F7F9A /* HMSlotItemEquipTypeTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMSlotItemEquipTypeTransformer.m; sourceTree = ""; }; F4268007193AF4E000B2C27F /* HMUserDefaults.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMUserDefaults.h; sourceTree = ""; }; F4268008193AF4E000B2C27F /* HMUserDefaults.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMUserDefaults.m; sourceTree = ""; }; F42680101943E92D00B2C27F /* HMKCShipObject+Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "HMKCShipObject+Extensions.h"; sourceTree = ""; }; @@ -305,6 +303,7 @@ F4B30CF01A458AF1008E3D79 /* KCD-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "KCD-Bridging-Header.h"; sourceTree = ""; }; F4B30CF11A458AF2008E3D79 /* HMSlotItemWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMSlotItemWindowController.swift; sourceTree = ""; }; F4B30CF51A45BABE008E3D79 /* HMUpgradableShipsWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMUpgradableShipsWindowController.swift; sourceTree = ""; }; + F4B30CF71A45DACB008E3D79 /* HMSlotItemEquipTypeTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMSlotItemEquipTypeTransformer.swift; sourceTree = ""; }; F4B37EEE19FADFC9002F371A /* HMIgnoreZeroTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMIgnoreZeroTransformer.h; sourceTree = ""; }; F4B37EEF19FADFC9002F371A /* HMIgnoreZeroTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMIgnoreZeroTransformer.m; sourceTree = ""; }; F4B37EF119FBBBED002F371A /* HMRemodelSlotCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMRemodelSlotCommand.h; sourceTree = ""; }; @@ -494,8 +493,7 @@ F4BDEB59187252F30069D0CE /* HMAppDelegate.m */, F4268007193AF4E000B2C27F /* HMUserDefaults.h */, F4268008193AF4E000B2C27F /* HMUserDefaults.m */, - F4131EE71911445F004F7F9A /* HMSlotItemEquipTypeTransformer.h */, - F4131EE81911445F004F7F9A /* HMSlotItemEquipTypeTransformer.m */, + F4B30CF71A45DACB008E3D79 /* HMSlotItemEquipTypeTransformer.swift */, F42680351957000200B2C27F /* HMTimerCountFormatter.h */, F42680361957000200B2C27F /* HMTimerCountFormatter.m */, F4A3AD8319B0CAB700FDBF80 /* HMPlanToShowsBoldFontTransformer.h */, @@ -951,6 +949,7 @@ F4B414F818B1D35800468DAF /* HMMasterMissionCommand.m in Sources */, F4E33B5818BF5F67005B8C07 /* HMMemberSlotItemCommand.m in Sources */, F4C1190B18A74DF0005D5B25 /* HMJSONCommand.m in Sources */, + F4B30CF81A45DACB008E3D79 /* HMSlotItemEquipTypeTransformer.swift in Sources */, F44AB23E19E824D700F217AF /* HMKCSlotItemObject.m in Sources */, F4B414F518B1888800468DAF /* HMMasterFurnitureCommand.m in Sources */, F4AA0601192E1FE900844688 /* HMBattleCommand.m in Sources */, @@ -996,7 +995,6 @@ F4C3957418CDDFE500A1E918 /* HMKenzoDockStatus.m in Sources */, F4C118FB18A67B1C005D5B25 /* CanonicalRequest.m in Sources */, F4AA060D1930E69200844688 /* HMMidnightBattleCommand.m in Sources */, - F4131EE91911445F004F7F9A /* HMSlotItemEquipTypeTransformer.m in Sources */, F4BDEB5A187252F30069D0CE /* HMAppDelegate.m in Sources */, F4E7802B18DC3A820011BC4C /* HMLocalDataStore.m in Sources */, F494DC6718C8BA6400AE97E4 /* HMPowerUpSupportViewController.m in Sources */, diff --git a/KCD/HMAppDelegate.m b/KCD/HMAppDelegate.m index 2f4911a9..d9257dde 100644 --- a/KCD/HMAppDelegate.m +++ b/KCD/HMAppDelegate.m @@ -12,7 +12,6 @@ #import "HMBroserWindowController.h" #import "HMHistoryWindowController.h" #import "HMPreferencePanelController.h" -#import "HMUpgradableShipsWindowController.h" #import "HMScreenshotListWindowController.h" #import "HMShipMasterDetailWindowController.h" diff --git a/KCD/HMSlotItemEquipTypeTransformer.h b/KCD/HMSlotItemEquipTypeTransformer.h deleted file mode 100644 index 2df58aca..00000000 --- a/KCD/HMSlotItemEquipTypeTransformer.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// HMSlotItemEquipTypeTransformer.h -// KCD -// -// Created by Hori,Masaki on 2014/04/30. -// Copyright (c) 2014å¹´ Hori,Masaki. All rights reserved. -// - -#import - -@interface HMSlotItemEquipTypeTransformer : NSValueTransformer - -@end diff --git a/KCD/HMSlotItemEquipTypeTransformer.m b/KCD/HMSlotItemEquipTypeTransformer.m deleted file mode 100644 index 956932a4..00000000 --- a/KCD/HMSlotItemEquipTypeTransformer.m +++ /dev/null @@ -1,48 +0,0 @@ -// -// HMSlotItemEquipTypeTransformer.m -// KCD -// -// Created by Hori,Masaki on 2014/04/30. -// Copyright (c) 2014å¹´ Hori,Masaki. All rights reserved. -// - -#import "HMSlotItemEquipTypeTransformer.h" - -#import "HMServerDataStore.h" - -@implementation HMSlotItemEquipTypeTransformer -+ (void)load -{ - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - [NSValueTransformer setValueTransformer:[self new] forName:@"HMSlotItemEquipTypeTransformer"]; - }); -} - -+ (Class)transformedValueClass -{ - return [NSString class]; -} -+ (BOOL)allowsReverseTransformation -{ - return NO; -} - -- (id)transformedValue:(id)value -{ - if(![value isKindOfClass:[NSNumber class]]) return nil; - - HMServerDataStore *store = [HMServerDataStore oneTimeEditor]; - - NSError *error = nil; - NSArray *array = [store objectsWithEntityName:@"MasterSlotItemEquipType" - error:&error - predicateFormat:@"id = %@", value]; - if([array count] == 0) { - NSLog(@"MasterSlotItemEquipType is invalid."); - return nil; - } - - return [[array[0] valueForKey:@"name"] copy]; -} -@end diff --git a/KCD/HMSlotItemEquipTypeTransformer.swift b/KCD/HMSlotItemEquipTypeTransformer.swift new file mode 100644 index 00000000..ced1681d --- /dev/null +++ b/KCD/HMSlotItemEquipTypeTransformer.swift @@ -0,0 +1,47 @@ +// +// HMSlotItemEquipTypeTransformer.swift +// KCD +// +// Created by Hori,Masaki on 2014/12/21. +// Copyright (c) 2014å¹´ Hori,Masaki. All rights reserved. +// + +import Cocoa +import ObjectiveC + + +@objc +class HMSlotItemEquipTypeTransformer: NSValueTransformer +{ + override class func load() { + NSValueTransformer.setValueTransformer(HMSlotItemEquipTypeTransformer(), forName: "HMSlotItemEquipTypeTransformer") + } + + override class func transformedValueClass() -> AnyClass { + return NSString.self + } + + override class func allowsReverseTransformation() -> Bool { return false } + + override func transformedValue(value: AnyObject?) -> AnyObject? { + let numValue = value as? NSNumber + if numValue == nil { + return nil + } + + var store = HMServerDataStore.oneTimeEditor() + var error : NSError? = nil + var array = store.objectsWithEntityName("MasterSlotItemEquipType", predicate: NSPredicate(format: "id = %@", numValue!), error: &error) + if let actualError = error { + println("MasterSlotItemEquipType is invalid. error ->/(actualError)") + return nil + } + if array.count == 0 { + println("MasterSlotItemEquipType is invalid.") + return nil + } + + return array[0].valueForKey("name") + } + +} -- 2.11.0