HMKCSlotItemObjectクラスをSwiftで書き換え

diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj
index 47db8ca..19a45a2 100644 (file)
--- a/KCD.xcodeproj/project.pbxproj
+++ b/KCD.xcodeproj/project.pbxproj
@@ -28,8 +28,6 @@
                F43F3D4F1A34ACCD00D6DAF7 /* HMKCShipObject.m in Sources */ = {isa = PBXBuildFile; fileRef = F43F3D4E1A34ACCD00D6DAF7 /* HMKCShipObject.m */; };
                F43F3D521A39CC7500D6DAF7 /* HMKCMasterSlotItemObject.m in Sources */ = {isa = PBXBuildFile; fileRef = F43F3D511A39CC7500D6DAF7 /* HMKCMasterSlotItemObject.m */; };
                F44AB23519E805D100F217AF /* HMKaisouLockCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F44AB23419E805D100F217AF /* HMKaisouLockCommand.m */; };
-               F44AB23E19E824D700F217AF /* HMKCSlotItemObject.m in Sources */ = {isa = PBXBuildFile; fileRef = F44AB23D19E824D700F217AF /* HMKCSlotItemObject.m */; };
-               F44AB24119E8252600F217AF /* HMKCSlotItemObject+Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = F44AB24019E8252600F217AF /* HMKCSlotItemObject+Extensions.m */; };
                F4513EDD18B619B600073552 /* HMCoreDataManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F4513EDC18B619B600073552 /* HMCoreDataManager.m */; };
                F4513EE818B77A5300073552 /* HMMemberKDockCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4513EE718B77A5300073552 /* HMMemberKDockCommand.m */; };
                F4513EEB18B7900A00073552 /* HMMemberDeckCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4513EEA18B7900A00073552 /* HMMemberDeckCommand.m */; };
@@ -57,6 +55,8 @@
                F477E2391A52DE1600493198 /* HMKaihatuHistory.swift in Sources */ = {isa = PBXBuildFile; fileRef = F477E2381A52DE1600493198 /* HMKaihatuHistory.swift */; };
                F477E23D1A52FAE400493198 /* HMKCDeck+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F477E23C1A52FAE400493198 /* HMKCDeck+Extension.swift */; };
                F477E23F1A530C3800493198 /* HMKCDeck.swift in Sources */ = {isa = PBXBuildFile; fileRef = F477E23E1A530C3800493198 /* HMKCDeck.swift */; };
+               F477E2411A5362C900493198 /* HMKCSlotItemObject+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F477E2401A5362C900493198 /* HMKCSlotItemObject+Extension.swift */; };
+               F477E2431A53836200493198 /* HMKCSlotItemObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = F477E2421A53836200493198 /* HMKCSlotItemObject.swift */; };
                F47B78B218A7B42B0011386E /* HMJSONViewWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F47B78B018A7B42B0011386E /* HMJSONViewWindowController.m */; };
                F48F7B021907D7B800E78AE1 /* HMPortCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F48F7B011907D7B800E78AE1 /* HMPortCommand.m */; };
                F494DC5F18C30AE100AE97E4 /* HMMissionStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = F494DC5E18C30AE100AE97E4 /* HMMissionStatus.m */; };
@@ -200,10 +200,6 @@
                F43F3D511A39CC7500D6DAF7 /* HMKCMasterSlotItemObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMKCMasterSlotItemObject.m; sourceTree = "<group>"; };
                F44AB23319E805D100F217AF /* HMKaisouLockCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMKaisouLockCommand.h; sourceTree = "<group>"; };
                F44AB23419E805D100F217AF /* HMKaisouLockCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMKaisouLockCommand.m; sourceTree = "<group>"; };
-               F44AB23C19E824D700F217AF /* HMKCSlotItemObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMKCSlotItemObject.h; sourceTree = "<group>"; };
-               F44AB23D19E824D700F217AF /* HMKCSlotItemObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMKCSlotItemObject.m; sourceTree = "<group>"; };
-               F44AB23F19E8252600F217AF /* HMKCSlotItemObject+Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "HMKCSlotItemObject+Extensions.h"; sourceTree = "<group>"; };
-               F44AB24019E8252600F217AF /* HMKCSlotItemObject+Extensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "HMKCSlotItemObject+Extensions.m"; sourceTree = "<group>"; };
                F4513EDB18B619B600073552 /* HMCoreDataManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMCoreDataManager.h; sourceTree = "<group>"; };
                F4513EDC18B619B600073552 /* HMCoreDataManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMCoreDataManager.m; sourceTree = "<group>"; };
                F4513EE618B77A5300073552 /* HMMemberKDockCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMemberKDockCommand.h; sourceTree = "<group>"; };
@@ -241,6 +237,8 @@
                F477E2381A52DE1600493198 /* HMKaihatuHistory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMKaihatuHistory.swift; sourceTree = "<group>"; };
                F477E23C1A52FAE400493198 /* HMKCDeck+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "HMKCDeck+Extension.swift"; sourceTree = "<group>"; };
                F477E23E1A530C3800493198 /* HMKCDeck.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMKCDeck.swift; sourceTree = "<group>"; };
+               F477E2401A5362C900493198 /* HMKCSlotItemObject+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "HMKCSlotItemObject+Extension.swift"; sourceTree = "<group>"; };
+               F477E2421A53836200493198 /* HMKCSlotItemObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMKCSlotItemObject.swift; sourceTree = "<group>"; };
                F47B78AF18A7B42B0011386E /* HMJSONViewWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMJSONViewWindowController.h; sourceTree = "<group>"; };
                F47B78B018A7B42B0011386E /* HMJSONViewWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMJSONViewWindowController.m; sourceTree = "<group>"; };
                F48F7B001907D7B800E78AE1 /* HMPortCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMPortCommand.h; sourceTree = "<group>"; };
@@ -557,10 +555,8 @@
                                F42680111943E92D00B2C27F /* HMKCShipObject+Extensions.m */,
                                F43F3D501A39CC7500D6DAF7 /* HMKCMasterSlotItemObject.h */,
                                F43F3D511A39CC7500D6DAF7 /* HMKCMasterSlotItemObject.m */,
-                               F44AB23C19E824D700F217AF /* HMKCSlotItemObject.h */,
-                               F44AB23D19E824D700F217AF /* HMKCSlotItemObject.m */,
-                               F44AB23F19E8252600F217AF /* HMKCSlotItemObject+Extensions.h */,
-                               F44AB24019E8252600F217AF /* HMKCSlotItemObject+Extensions.m */,
+                               F477E2421A53836200493198 /* HMKCSlotItemObject.swift */,
+                               F477E2401A5362C900493198 /* HMKCSlotItemObject+Extension.swift */,
                                F477E23E1A530C3800493198 /* HMKCDeck.swift */,
                                F477E23C1A52FAE400493198 /* HMKCDeck+Extension.swift */,
                                F4E7802C18DC3AF00011BC4C /* LocalData.xcdatamodeld */,
@@ -904,7 +900,6 @@
                                F4131ED5190F63D8004F7F9A /* HMUpdateSlotItemCommand.m in Sources */,
                                F4C1190518A71AEA005D5B25 /* HMJSONReciever.m in Sources */,
                                F4551BDE1A46C23100BB0235 /* HMTimerCountFormatter.swift in Sources */,
-                               F44AB24119E8252600F217AF /* HMKCSlotItemObject+Extensions.m in Sources */,
                                F4A3AD82199F529700FDBF80 /* HMCombinedBattleCommand.m in Sources */,
                                F4AA05FE192B932E00844688 /* HMTemporaryDataStore.m in Sources */,
                                F4B414F818B1D35800468DAF /* HMMasterMissionCommand.m in Sources */,
@@ -912,7 +907,6 @@
                                F4E802071A50F8A100016781 /* HMSuppliesView.swift 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 */,
                                F43F3D521A39CC7500D6DAF7 /* HMKCMasterSlotItemObject.m in Sources */,
@@ -927,6 +921,7 @@
                                F43F3D4C1A34AC8000D6DAF7 /* HMKCMasterShipObject.m in Sources */,
                                F4268031194D1B1A00B2C27F /* HMChangeHenseiCommand.m in Sources */,
                                F4E802091A511F5900016781 /* HMSuppliesCell.swift in Sources */,
+                               F477E2411A5362C900493198 /* HMKCSlotItemObject+Extension.swift in Sources */,
                                F4551BE61A48711D00BB0235 /* HMScreenshotInformation.swift in Sources */,
                                F494DC6D18CC054800AE97E4 /* HMNyukyoDockStatus.m in Sources */,
                                F43BA4A1197BE22200CFF788 /* HMDestroyShipCommand.m in Sources */,
@@ -937,6 +932,7 @@
                                F4D2CBCB18B05E58000EBC59 /* HMMaserShipCommand.m in Sources */,
                                F477E2371A52D70F00493198 /* HMKenzoHistory.swift in Sources */,
                                F4513EFA18BB699700073552 /* HMShipWindowController.m in Sources */,
+                               F477E2431A53836200493198 /* HMKCSlotItemObject.swift in Sources */,
                                F42680121943E92D00B2C27F /* HMKCShipObject+Extensions.m in Sources */,
                                F46F104118A9B85E0063E503 /* HMJSONNode.m in Sources */,
                                F454F7831A261844003042DD /* HMFleetInformation.m in Sources */,

diff --git a/KCD/HMKCSlotItemObject+Extension.swift b/KCD/HMKCSlotItemObject+Extension.swift
new file mode 100644 (file)
index 0000000..a72aefc
--- /dev/null
+++ b/KCD/HMKCSlotItemObject+Extension.swift
@@ -0,0 +1,45 @@
+//
+//  HMKCSlotItemObject.swift
+//  KCD
+//
+//  Created by Hori,Masaki on 2014/12/31.
+//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
+//
+
+import Foundation
+import CoreData
+
+extension HMKCSlotItemObject {
+       var name: String? {
+               willAccessValueForKey("master_slotItem")
+               let name = master_slotItem.name
+               didAccessValueForKey("master_slotItem")
+               return name
+       }
+       var equippedShipName: String? {
+               willAccessValueForKey("equippedShip")
+               let name = equippedShip.name
+               didAccessValueForKey("equippedShip")
+               return name
+       }
+       var masterSlotItemRare: Int {
+               willAccessValueForKey("master_slotItem")
+               let rare = master_slotItem.rare
+               didAccessValueForKey("master_slotItem")
+               if rare == nil { return 0 }
+               return rare!.integerValue
+       }
+       var typeName: Int {
+               willAccessValueForKey("master_slotItem")
+               let name = master_slotItem.type_2
+               didAccessValueForKey("master_slotItem")
+               if name == nil { return 0 }
+               return name!.integerValue
+       }
+       var isLocked: Bool {
+               willAccessValueForKey("locked")
+               let locked = self.locked.boolValue
+               didAccessValueForKey("locked")
+               return locked ?? false
+       }
+}

diff --git a/KCD/HMKCSlotItemObject+Extensions.h b/KCD/HMKCSlotItemObject+Extensions.h
deleted file mode 100644 (file)
index 876feda..0000000
--- a/KCD/HMKCSlotItemObject+Extensions.h
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-//  HMKCSlotItemObject+Extensions.h
-//  KCD
-//
-//  Created by Hori,Masaki on 2014/10/10.
-//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMKCSlotItemObject.h"
-
-@interface HMKCSlotItemObject (Extensions)
-
-@property (readonly) NSString *name;
-
-@property (readonly) NSString *equippedShipName;
-@property (readonly) NSNumber *masterSlotItemRare;
-@property (readonly) NSString *typeName;
-
-@property (readonly) NSNumber *isLocked;
-@end

diff --git a/KCD/HMKCSlotItemObject+Extensions.m b/KCD/HMKCSlotItemObject+Extensions.m
deleted file mode 100644 (file)
index ae6f3e9..0000000
--- a/KCD/HMKCSlotItemObject+Extensions.m
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-//  HMKCSlotItemObject+Extensions.m
-//  KCD
-//
-//  Created by Hori,Masaki on 2014/10/10.
-//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMKCSlotItemObject+Extensions.h"
-
-#import "HMKCShipObject+Extensions.h"
-#import "HMKCMasterSlotItemObject.h"
-
-#import "HMServerDataStore.h"
-
-
-@implementation HMKCSlotItemObject (Extensions)
-- (NSString *)name
-{
-       [self willAccessValueForKey:@"master_slotItem"];
-       NSString *name = [self.master_slotItem valueForKey:@"name"];
-       [self didAccessValueForKey:@"master_slotItem"];
-       return name;
-}
-
-- (NSString *)equippedShipName
-{
-       [self willAccessValueForKey:@"equippedShip"];
-       NSString *equippedShipName = self.equippedShip.name;
-       [self didAccessValueForKey:@"equippedShip"];
-       return equippedShipName;
-}
-- (NSNumber *)masterSlotItemRare
-{
-       [self willAccessValueForKey:@"master_slotItem"];
-       NSNumber *masterSlotItemRare = [self.master_slotItem valueForKey:@"rare"];
-       [self didAccessValueForKey:@"master_slotItem"];
-       return masterSlotItemRare;
-}
-- (NSString *)typeName
-{
-       [self willAccessValueForKey:@"master_slotItem"];
-       NSString *typeName = [self.master_slotItem valueForKey:@"type_2"];
-       [self didAccessValueForKey:@"master_slotItem"];
-       return typeName;
-}
-- (NSNumber *)isLocked
-{
-       [self willAccessValueForKey:@"locked"];
-       NSNumber *locked = self.locked;
-       [self didAccessValueForKey:@"locked"];
-       return locked;
-}
-- (void)setIsLocked:(NSNumber *)isLocked {}
-
-@end

diff --git a/KCD/HMKCSlotItemObject.h b/KCD/HMKCSlotItemObject.h
deleted file mode 100644 (file)
index 2eb8354..0000000
--- a/KCD/HMKCSlotItemObject.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  HMKCSlotItemObject.h
-//  KCD
-//
-//  Created by Hori,Masaki on 2014/10/10.
-//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMKCManagedObject.h"
-
-@class HMKCManagedObject, HMKCShipObject, HMKCMasterSlotItemObject;
-
-@interface HMKCSlotItemObject : HMKCManagedObject
-
-@property (nonatomic, retain) NSNumber * id;
-@property (nonatomic, retain) NSNumber * level;
-@property (nonatomic, retain) NSNumber * locked;
-@property (nonatomic, retain) NSNumber * slotitem_id;
-@property (nonatomic, retain) HMKCShipObject *equippedShip;
-@property (nonatomic, retain) HMKCMasterSlotItemObject *master_slotItem;
-
-@end

diff --git a/KCD/HMKCSlotItemObject.m b/KCD/HMKCSlotItemObject.m
deleted file mode 100644 (file)
index 630b831..0000000
--- a/KCD/HMKCSlotItemObject.m
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-//  HMKCSlotItemObject.m
-//  KCD
-//
-//  Created by Hori,Masaki on 2014/10/10.
-//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMKCSlotItemObject.h"
-#import "HMKCManagedObject.h"
-#import "HMKCShipObject.h"
-
-
-@implementation HMKCSlotItemObject
-
-@dynamic id;
-@dynamic level;
-@dynamic locked;
-@dynamic slotitem_id;
-@dynamic equippedShip;
-@dynamic master_slotItem;
-
-@end

diff --git a/KCD/HMKCSlotItemObject.swift b/KCD/HMKCSlotItemObject.swift
new file mode 100644 (file)
index 0000000..495340d
--- /dev/null
+++ b/KCD/HMKCSlotItemObject.swift
@@ -0,0 +1,21 @@
+//
+//  HMKCSlotItemObject.swift
+//  KCD
+//
+//  Created by Hori,Masaki on 2014/12/31.
+//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
+//
+
+import Foundation
+import CoreData
+
+class HMKCSlotItemObject: HMKCManagedObject {
+
+    @NSManaged var id: NSNumber
+    @NSManaged var level: NSNumber
+    @NSManaged var locked: NSNumber
+    @NSManaged var slotitem_id: NSNumber
+    @NSManaged var equippedShip: HMKCShipObject
+    @NSManaged var master_slotItem: HMKCMasterSlotItemObject
+
+}

diff --git a/KCD/KCD-Bridging-Header.h b/KCD/KCD-Bridging-Header.h
index d4c13b0..48d0a03 100644 (file)
--- a/KCD/KCD-Bridging-Header.h
+++ b/KCD/KCD-Bridging-Header.h
@@ -11,6 +11,7 @@
 
 #import "HMKCManagedObject.h"
 #import "HMKCShipObject+Extensions.h"
+#import "HMKCMasterSlotItemObject.h"
 
 #import "HMMissionStatus.h"
 #import "HMNyukyoDockStatus.h"

diff --git a/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents b/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents
index ff90e55..d764b7d 100644 (file)
--- a/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents
+++ b/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents
@@ -303,7 +303,7 @@
         <relationship name="equippedItem" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="SlotItem" inverseName="equippedShip" inverseEntity="SlotItem" syncable="YES"/>
         <relationship name="master_ship" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="MasterShip" inverseName="ships" inverseEntity="MasterShip" syncable="YES"/>
     </entity>
-    <entity name="SlotItem" representedClassName="HMKCSlotItemObject" syncable="YES">
+    <entity name="SlotItem" representedClassName="KCD.HMKCSlotItemObject" syncable="YES">
         <attribute name="id" attributeType="Integer 64" defaultValueString="0" indexed="YES" syncable="YES"/>
         <attribute name="level" optional="YES" attributeType="Integer 64" defaultValueString="0" syncable="YES"/>
         <attribute name="locked" optional="YES" attributeType="Boolean" syncable="YES"/>

diff --git a/KCD/ja.lproj/HMScreenshotListWindowController.xib b/KCD/ja.lproj/HMScreenshotListWindowController.xib
index 628dba9..81253aa 100644 (file)
--- a/KCD/ja.lproj/HMScreenshotListWindowController.xib
+++ b/KCD/ja.lproj/HMScreenshotListWindowController.xib
@@ -36,12 +36,12 @@
                             <rect key="frame" x="1" y="1" width="166" height="79"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <ikImageBrowserView autoresizesSubviews="NO" zoomValue="0.5" allowsMultipleSelection="NO" allowsEmptySelection="NO" id="FPI-Ma-X6H">
-                                    <rect key="frame" x="0.0" y="0.0" width="10000" height="2885"/>
+                                <ikImageBrowserView autoresizesSubviews="NO" zoomValue="1.4601032733917236" allowsMultipleSelection="NO" allowsEmptySelection="NO" id="FPI-Ma-X6H">
+                                    <rect key="frame" x="0.0" y="0.0" width="10000" height="3236"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
                                     <ikCellsStyle key="cellsStyleMask" none="YES" shadowed="YES" titled="YES" subtitled="YES"/>
                                     <autoresizingMask key="contentResizingMask" heightSizable="YES"/>
-                                    <size key="cellSize" width="125" height="125"/>
+                                    <size key="cellSize" width="739" height="739"/>
                                     <connections>
                                         <binding destination="mrq-7Y-mHG" name="content" keyPath="arrangedObjects" id="G0M-vZ-Pyi"/>
                                         <binding destination="-2" name="selectionIndexes" keyPath="selectedIndexes" previousBinding="G0M-vZ-Pyi" id="hZm-cJ-NmG"/>