From aefe993a401d71798f59cde6d8abf65ab593f370 Mon Sep 17 00:00:00 2001 From: masakih Date: Sun, 29 Jan 2017 17:42:45 +0900 Subject: [PATCH] =?utf8?q?HMKCMasterSlotItemEquipTypeObject=E3=82=92Swift?= =?utf8?q?=E3=81=AB=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 | 16 ++++---------- ...KCMasterSlotItemEquipTypeObject+CoreDataClass.m | 14 ------------ ...terSlotItemEquipTypeObject+CoreDataProperties.h | 25 ---------------------- ...terSlotItemEquipTypeObject+CoreDataProperties.m | 22 ------------------- KCD/HMKCMasterSlotItemEquipTypeObject.h | 21 ------------------ KCD/HMKCMasterSlotItemEquipTypeObject.swift | 15 +++++++++++++ KCD/HMSlotItemEquipTypeTransformer.swift | 6 +++--- KCD/KCD-Bridging-Header.h | 1 - KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents | 6 +++--- 9 files changed, 25 insertions(+), 101 deletions(-) delete mode 100644 KCD/HMKCMasterSlotItemEquipTypeObject+CoreDataClass.m delete mode 100644 KCD/HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.h delete mode 100644 KCD/HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.m delete mode 100644 KCD/HMKCMasterSlotItemEquipTypeObject.h create mode 100644 KCD/HMKCMasterSlotItemEquipTypeObject.swift diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj index c661badc..42bacdff 100644 --- a/KCD.xcodeproj/project.pbxproj +++ b/KCD.xcodeproj/project.pbxproj @@ -22,6 +22,7 @@ F42A8FCE1E3DA7E90099DC1D /* HMKCMasterShipObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = F42A8FCD1E3DA7E90099DC1D /* HMKCMasterShipObject.swift */; }; F42A8FD01E3DB49A0099DC1D /* HMKCMasterSlotItemObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = F42A8FCF1E3DB49A0099DC1D /* HMKCMasterSlotItemObject.swift */; }; F42A8FD21E3DC56C0099DC1D /* HMKCMasterSType.swift in Sources */ = {isa = PBXBuildFile; fileRef = F42A8FD11E3DC56C0099DC1D /* HMKCMasterSType.swift */; }; + F42A8FD41E3DD57E0099DC1D /* HMKCMasterSlotItemEquipTypeObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = F42A8FD31E3DD57E0099DC1D /* HMKCMasterSlotItemEquipTypeObject.swift */; }; F42CFE161E3BA1E1000B4F9B /* HMEnhancementListItem2.plist in Resources */ = {isa = PBXBuildFile; fileRef = F42CFE151E3BA1E1000B4F9B /* HMEnhancementListItem2.plist */; }; F42CFE181E3C12AA000B4F9B /* HMScreenshotInformation.swift in Sources */ = {isa = PBXBuildFile; fileRef = F42CFE171E3C12AA000B4F9B /* HMScreenshotInformation.swift */; }; F42CFE1A1E3C726D000B4F9B /* UserDefaultsExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F42CFE191E3C726D000B4F9B /* UserDefaultsExtension.swift */; }; @@ -166,8 +167,6 @@ F4AA59141E1C951F001667AF /* HMTimerCountFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AA59131E1C951F001667AF /* HMTimerCountFormatter.swift */; }; F4AA59161E1C9C5D001667AF /* ValueTransformerRegister.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AA59151E1C9C5D001667AF /* ValueTransformerRegister.swift */; }; F4AA591A1E1CE2EA001667AF /* HMSlotItemEquipTypeTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AA59191E1CE2EA001667AF /* HMSlotItemEquipTypeTransformer.swift */; }; - F4AA59251E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = F4AA59221E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataClass.m */; }; - F4AA59261E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = F4AA59241E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.m */; }; F4AA59281E1CEF8E001667AF /* HMPlanToShowsBoldFontTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AA59271E1CEF8E001667AF /* HMPlanToShowsBoldFontTransformer.swift */; }; F4AA592A1E1D1387001667AF /* HMIgnoreZeroTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AA59291E1D1387001667AF /* HMIgnoreZeroTransformer.swift */; }; F4AA592E1E1D1D4D001667AF /* HMSokuTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AA592D1E1D1D4D001667AF /* HMSokuTransformer.swift */; }; @@ -335,6 +334,7 @@ F42A8FCD1E3DA7E90099DC1D /* HMKCMasterShipObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMKCMasterShipObject.swift; sourceTree = ""; }; F42A8FCF1E3DB49A0099DC1D /* HMKCMasterSlotItemObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMKCMasterSlotItemObject.swift; sourceTree = ""; }; F42A8FD11E3DC56C0099DC1D /* HMKCMasterSType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMKCMasterSType.swift; sourceTree = ""; }; + F42A8FD31E3DD57E0099DC1D /* HMKCMasterSlotItemEquipTypeObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMKCMasterSlotItemEquipTypeObject.swift; sourceTree = ""; }; F42CBB201D1ED41D004C2AE2 /* LocalData 3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "LocalData 3.xcdatamodel"; sourceTree = ""; }; F42CFE151E3BA1E1000B4F9B /* HMEnhancementListItem2.plist */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; path = HMEnhancementListItem2.plist; sourceTree = ""; }; F42CFE171E3C12AA000B4F9B /* HMScreenshotInformation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMScreenshotInformation.swift; sourceTree = ""; }; @@ -507,10 +507,6 @@ F4AA59131E1C951F001667AF /* HMTimerCountFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMTimerCountFormatter.swift; sourceTree = ""; }; F4AA59151E1C9C5D001667AF /* ValueTransformerRegister.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ValueTransformerRegister.swift; sourceTree = ""; }; F4AA59191E1CE2EA001667AF /* HMSlotItemEquipTypeTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMSlotItemEquipTypeTransformer.swift; sourceTree = ""; }; - F4AA59211E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMKCMasterSlotItemEquipTypeObject.h; sourceTree = ""; }; - F4AA59221E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "HMKCMasterSlotItemEquipTypeObject+CoreDataClass.m"; sourceTree = ""; }; - F4AA59231E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.h"; sourceTree = ""; }; - F4AA59241E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.m"; sourceTree = ""; }; F4AA59271E1CEF8E001667AF /* HMPlanToShowsBoldFontTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMPlanToShowsBoldFontTransformer.swift; sourceTree = ""; }; F4AA59291E1D1387001667AF /* HMIgnoreZeroTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMIgnoreZeroTransformer.swift; sourceTree = ""; }; F4AA592D1E1D1D4D001667AF /* HMSokuTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMSokuTransformer.swift; sourceTree = ""; }; @@ -1186,10 +1182,7 @@ F42A8FCD1E3DA7E90099DC1D /* HMKCMasterShipObject.swift */, F42A8FCF1E3DB49A0099DC1D /* HMKCMasterSlotItemObject.swift */, F42A8FD11E3DC56C0099DC1D /* HMKCMasterSType.swift */, - F4AA59211E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject.h */, - F4AA59221E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataClass.m */, - F4AA59231E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.h */, - F4AA59241E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.m */, + F42A8FD31E3DD57E0099DC1D /* HMKCMasterSlotItemEquipTypeObject.swift */, F448F9931B70E9BE004901AD /* HMKCMaterial.h */, F448F9941B70E9BE004901AD /* HMKCMaterial.m */, F4F9F88B1C6B6ACA00D0EE76 /* HMKCNyukyoDock+CoreDataProperties.h */, @@ -1487,7 +1480,6 @@ F4AA59381E1DC4C3001667AF /* HMMapAreaTransformaer.swift in Sources */, F47215A21E1F38280083D3BC /* HMQueue.swift in Sources */, F42CFE261E3D91FD000B4F9B /* HMKCMasterMapArea.swift in Sources */, - F4AA59251E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataClass.m in Sources */, F44BC6F11E23A10C004644E3 /* HMRemodelSlotItemCommand.swift in Sources */, F4048A9F1E19308A008ACFD6 /* HMStrokeTextFieldCell.swift in Sources */, F4CF25AA1E338ED000C02A66 /* HMJSONTracker.swift in Sources */, @@ -1501,6 +1493,7 @@ F4AC136D1E0802C000851147 /* HMPreferencePanelController.swift in Sources */, F44BC6E91E232B15004644E3 /* HMKaisouLockCommand.swift in Sources */, F44BC6EF1E239FB1004644E3 /* HMRemodelSlotCommand.swift in Sources */, + F42A8FD41E3DD57E0099DC1D /* HMKCMasterSlotItemEquipTypeObject.swift in Sources */, F48A705D1DE58A38005DFC0B /* HMKCAirBase+CoreDataProperties.m in Sources */, F4AA59161E1C9C5D001667AF /* ValueTransformerRegister.swift in Sources */, F4CF25DE1E38E06300C02A66 /* HMEnhancementListItem.swift in Sources */, @@ -1530,7 +1523,6 @@ F44BC6E51E23082B004644E3 /* HMCombinedCommand.swift in Sources */, F4AA59401E1E23EC001667AF /* HMHistoryMarkTransformer.swift in Sources */, F44BC7131E28FDC4004644E3 /* HMMemberShipCommand.swift in Sources */, - F4AA59261E1CE7E5001667AF /* HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.m in Sources */, F44BC7291E2A0842004644E3 /* HMMasterMapCellCommand.swift in Sources */, F49097831E19F7760085A45D /* HMStrengthenListItemCellView.swift in Sources */, F495462E1B1894DD00E0D8D0 /* Bookmark.xcdatamodeld in Sources */, diff --git a/KCD/HMKCMasterSlotItemEquipTypeObject+CoreDataClass.m b/KCD/HMKCMasterSlotItemEquipTypeObject+CoreDataClass.m deleted file mode 100644 index 6494f562..00000000 --- a/KCD/HMKCMasterSlotItemEquipTypeObject+CoreDataClass.m +++ /dev/null @@ -1,14 +0,0 @@ -// -// HMKCMasterSlotItemEquipTypeObject+CoreDataClass.m -// KCD -// -// Created by Hori,Masaki on 2017/01/04. -// Copyright © 2017年 Hori,Masaki. All rights reserved. -// This file was automatically generated and should not be edited. -// - -#import "HMKCMasterSlotItemEquipTypeObject.h" - -@implementation HMKCMasterSlotItemEquipTypeObject - -@end diff --git a/KCD/HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.h b/KCD/HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.h deleted file mode 100644 index 32e61f48..00000000 --- a/KCD/HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.h -// KCD -// -// Created by Hori,Masaki on 2017/01/04. -// Copyright © 2017年 Hori,Masaki. All rights reserved. -// This file was automatically generated and should not be edited. -// - -#import "HMKCMasterSlotItemEquipTypeObject.h" - - -NS_ASSUME_NONNULL_BEGIN - -@interface HMKCMasterSlotItemEquipTypeObject (CoreDataProperties) - -+ (NSFetchRequest *)fetchRequest; - -@property (nullable, nonatomic, copy) NSNumber *id; -@property (nullable, nonatomic, copy) NSString *name; -@property (nullable, nonatomic, copy) NSNumber *show_flg; - -@end - -NS_ASSUME_NONNULL_END diff --git a/KCD/HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.m b/KCD/HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.m deleted file mode 100644 index 12e57d4b..00000000 --- a/KCD/HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.m +++ /dev/null @@ -1,22 +0,0 @@ -// -// HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.m -// KCD -// -// Created by Hori,Masaki on 2017/01/04. -// Copyright © 2017年 Hori,Masaki. All rights reserved. -// This file was automatically generated and should not be edited. -// - -#import "HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.h" - -@implementation HMKCMasterSlotItemEquipTypeObject (CoreDataProperties) - -+ (NSFetchRequest *)fetchRequest { - return [[NSFetchRequest alloc] initWithEntityName:@"MasterSlotItemEquipType"]; -} - -@dynamic id; -@dynamic name; -@dynamic show_flg; - -@end diff --git a/KCD/HMKCMasterSlotItemEquipTypeObject.h b/KCD/HMKCMasterSlotItemEquipTypeObject.h deleted file mode 100644 index 4bfe7a41..00000000 --- a/KCD/HMKCMasterSlotItemEquipTypeObject.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// HMKCMasterSlotItemEquipTypeObject+CoreDataClass.h -// KCD -// -// Created by Hori,Masaki on 2017/01/04. -// Copyright © 2017年 Hori,Masaki. All rights reserved. -// This file was automatically generated and should not be edited. -// - -#import "HMKCManagedObject.h" - - -NS_ASSUME_NONNULL_BEGIN - -@interface HMKCMasterSlotItemEquipTypeObject : HMKCManagedObject - -@end - -NS_ASSUME_NONNULL_END - -#import "HMKCMasterSlotItemEquipTypeObject+CoreDataProperties.h" diff --git a/KCD/HMKCMasterSlotItemEquipTypeObject.swift b/KCD/HMKCMasterSlotItemEquipTypeObject.swift new file mode 100644 index 00000000..0ce9d955 --- /dev/null +++ b/KCD/HMKCMasterSlotItemEquipTypeObject.swift @@ -0,0 +1,15 @@ +// +// HMKCMasterSlotItemEquipTypeObject.swift +// KCD +// +// Created by Hori,Masaki on 2017/01/29. +// Copyright © 2017年 Hori,Masaki. All rights reserved. +// + +import Foundation + +class HMKCMasterSlotItemEquipTypeObject: HMKCManagedObject { + @NSManaged var id: Int + @NSManaged var name: String + @NSManaged var show_flg: NSNumber? +} diff --git a/KCD/HMSlotItemEquipTypeTransformer.swift b/KCD/HMSlotItemEquipTypeTransformer.swift index 4a504792..282d30ae 100644 --- a/KCD/HMSlotItemEquipTypeTransformer.swift +++ b/KCD/HMSlotItemEquipTypeTransformer.swift @@ -17,10 +17,10 @@ class HMSlotItemEquipTypeTransformer: ValueTransformer { guard let store = HMServerDataStore.default() else { return nil } let predicate = NSPredicate(format: "id = %d", v) guard let a = try? store.objects(withEntityName: "MasterSlotItemEquipType", predicate: predicate), - let array = a as? [HMKCMasterSlotItemEquipTypeObject], - array.count != 0 + let types = a as? [HMKCMasterSlotItemEquipTypeObject], + let type = types.first else { return nil } - return array[0].name + return type.name } } diff --git a/KCD/KCD-Bridging-Header.h b/KCD/KCD-Bridging-Header.h index b1fe0a1a..19782a87 100644 --- a/KCD/KCD-Bridging-Header.h +++ b/KCD/KCD-Bridging-Header.h @@ -13,7 +13,6 @@ // Core Data #import "HMCoreDataManager.h" -#import "HMKCMasterSlotItemEquipTypeObject.h" #import "HMKCShipObject+Extensions.h" #import "HMKCSlotItemObject+Extensions.h" #import "HMKCMaterial.h" diff --git a/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents b/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents index b9aefdc5..432bbe7a 100644 --- a/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents +++ b/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents @@ -229,10 +229,10 @@ - + - - + + -- 2.11.0