HMKenzoHistoryクラスをSwiftで書き換え

diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj
index a7ebf24..f30f75c 100644 (file)
--- a/KCD.xcodeproj/project.pbxproj
+++ b/KCD.xcodeproj/project.pbxproj
@@ -55,6 +55,7 @@
                F46F103618A7CE310063E503 /* HMJSONViewCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F46F103518A7CE310063E503 /* HMJSONViewCommand.m */; };
                F46F104118A9B85E0063E503 /* HMJSONNode.m in Sources */ = {isa = PBXBuildFile; fileRef = F46F104018A9B85E0063E503 /* HMJSONNode.m */; };
                F46F104918ABAC910063E503 /* KCD.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = F46F104718ABAC910063E503 /* KCD.xcdatamodeld */; };
+               F477E2371A52D70F00493198 /* HMKenzoHistory.swift in Sources */ = {isa = PBXBuildFile; fileRef = F477E2361A52D70F00493198 /* HMKenzoHistory.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 */; };
@@ -87,7 +88,6 @@
                F4B37EFF19FC8DCC002F371A /* HMUpgradableShipsWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4B37F0119FC8DCC002F371A /* HMUpgradableShipsWindowController.xib */; };
                F4B3DBCA18DDB9170011B4FC /* HMCreateSlotItemCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B3DBC918DDB9170011B4FC /* HMCreateSlotItemCommand.m */; };
                F4B3DC1B18DEAB5E0011B4FC /* HMKaihatuHistory.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B3DC1A18DEAB5E0011B4FC /* HMKaihatuHistory.m */; };
-               F4B3DC1E18DEB8C70011B4FC /* HMKenzoHistory.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B3DC1D18DEB8C70011B4FC /* HMKenzoHistory.m */; };
                F4B3DC2118DECF570011B4FC /* HMTSVSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B3DC2018DECF570011B4FC /* HMTSVSupport.m */; };
                F4B3DC2A18DF31400011B4FC /* HMCreateShipCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4B3DC2918DF31400011B4FC /* HMCreateShipCommand.m */; };
                F4B3DC3018E5C81E0011B4FC /* HMHistoryWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4B3DC3218E5C81E0011B4FC /* HMHistoryWindowController.xib */; };
@@ -241,6 +241,7 @@
                F46F103F18A9B85E0063E503 /* HMJSONNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMJSONNode.h; sourceTree = "<group>"; };
                F46F104018A9B85E0063E503 /* HMJSONNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMJSONNode.m; sourceTree = "<group>"; };
                F46F104818ABAC910063E503 /* KCD.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = KCD.xcdatamodel; sourceTree = "<group>"; };
+               F477E2361A52D70F00493198 /* HMKenzoHistory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMKenzoHistory.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>"; };
@@ -296,8 +297,6 @@
                F4B3DBC918DDB9170011B4FC /* HMCreateSlotItemCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMCreateSlotItemCommand.m; sourceTree = "<group>"; };
                F4B3DC1918DEAB5E0011B4FC /* HMKaihatuHistory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMKaihatuHistory.h; sourceTree = "<group>"; };
                F4B3DC1A18DEAB5E0011B4FC /* HMKaihatuHistory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMKaihatuHistory.m; sourceTree = "<group>"; };
-               F4B3DC1C18DEB8C70011B4FC /* HMKenzoHistory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMKenzoHistory.h; sourceTree = "<group>"; };
-               F4B3DC1D18DEB8C70011B4FC /* HMKenzoHistory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMKenzoHistory.m; sourceTree = "<group>"; };
                F4B3DC1F18DECF570011B4FC /* HMTSVSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMTSVSupport.h; sourceTree = "<group>"; };
                F4B3DC2018DECF570011B4FC /* HMTSVSupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMTSVSupport.m; sourceTree = "<group>"; };
                F4B3DC2818DF31400011B4FC /* HMCreateShipCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMCreateShipCommand.h; sourceTree = "<group>"; };
@@ -570,11 +569,10 @@
                                F44AB20419E053CB00F217AF /* HMKCDeck+Extension.h */,
                                F44AB20519E053CB00F217AF /* HMKCDeck+Extension.m */,
                                F4E7802C18DC3AF00011BC4C /* LocalData.xcdatamodeld */,
-                               F4B3DC1C18DEB8C70011B4FC /* HMKenzoHistory.h */,
-                               F4B3DC1D18DEB8C70011B4FC /* HMKenzoHistory.m */,
                                F4B3DC1918DEAB5E0011B4FC /* HMKaihatuHistory.h */,
                                F4B3DC1A18DEAB5E0011B4FC /* HMKaihatuHistory.m */,
                                F4E802101A52C12700016781 /* HMKenzoMark.swift */,
+                               F477E2361A52D70F00493198 /* HMKenzoHistory.swift */,
                                F4AA05F9192B92C700844688 /* Temporary.xcdatamodeld */,
                                F4AA05FC192B932E00844688 /* HMTemporaryDataStore.h */,
                                F4AA05FD192B932E00844688 /* HMTemporaryDataStore.m */,
@@ -899,7 +897,6 @@
                                F4E8020F1A5245F700016781 /* HMMaskSelectView.swift in Sources */,
                                F4B3DC2A18DF31400011B4FC /* HMCreateShipCommand.m in Sources */,
                                F46F103618A7CE310063E503 /* HMJSONViewCommand.m in Sources */,
-                               F4B3DC1E18DEB8C70011B4FC /* HMKenzoHistory.m in Sources */,
                                F4B3DC5218F150CD0011B4FC /* HMScreenshotWindowController.m in Sources */,
                                F426802E194D0FFD00B2C27F /* HMMemberShip3Command.m in Sources */,
                                F4B37EF319FBBBED002F371A /* HMRemodelSlotCommand.m in Sources */,
@@ -944,6 +941,7 @@
                                F4C118FC18A67B1C005D5B25 /* CustomHTTPProtocol.m in Sources */,
                                F4B3DC1B18DEAB5E0011B4FC /* HMKaihatuHistory.m in Sources */,
                                F4D2CBCB18B05E58000EBC59 /* HMMaserShipCommand.m in Sources */,
+                               F477E2371A52D70F00493198 /* HMKenzoHistory.swift in Sources */,
                                F4513EFA18BB699700073552 /* HMShipWindowController.m in Sources */,
                                F42680121943E92D00B2C27F /* HMKCShipObject+Extensions.m in Sources */,
                                F46F104118A9B85E0063E503 /* HMJSONNode.m in Sources */,

diff --git a/KCD/HMKenzoHistory.h b/KCD/HMKenzoHistory.h
deleted file mode 100644 (file)
index e01381a..0000000
--- a/KCD/HMKenzoHistory.h
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-//  HMKenzoHistory.h
-//  KCD
-//
-//  Created by Hori,Masaki on 2014/03/23.
-//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <CoreData/CoreData.h>
-
-
-@interface HMKenzoHistory : NSManagedObject
-
-@property (nonatomic, retain) NSNumber * bauxite;
-@property (nonatomic, retain) NSNumber * bull;
-@property (nonatomic, retain) NSDate * date;
-@property (nonatomic, retain) NSNumber * fuel;
-@property (nonatomic, retain) NSNumber * kaihatusizai;
-@property (nonatomic, retain) NSString * name;
-@property (nonatomic, retain) NSNumber * steel;
-@property (nonatomic, retain) NSNumber * sTypeId;
-@property (nonatomic, retain) NSString * flagShipName;
-@property (nonatomic, retain) NSNumber * flagShipLv;
-@property (nonatomic, retain) NSNumber * commanderLv;
-
-@property (readonly) NSNumber *isLarge;
-
-@end

diff --git a/KCD/HMKenzoHistory.m b/KCD/HMKenzoHistory.m
deleted file mode 100644 (file)
index f79a586..0000000
--- a/KCD/HMKenzoHistory.m
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-//  HMKenzoHistory.m
-//  KCD
-//
-//  Created by Hori,Masaki on 2014/03/23.
-//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMKenzoHistory.h"
-
-
-@implementation HMKenzoHistory
-
-@dynamic bauxite;
-@dynamic bull;
-@dynamic date;
-@dynamic fuel;
-@dynamic kaihatusizai;
-@dynamic name;
-@dynamic steel;
-@dynamic sTypeId;
-@dynamic flagShipName;
-@dynamic flagShipLv;
-@dynamic commanderLv;
-
-- (NSNumber *)isLarge
-{
-       return [self.fuel compare:@1000] == NSOrderedDescending ? @YES : @NO;
-}
-
-@end

diff --git a/KCD/HMKenzoHistory.swift b/KCD/HMKenzoHistory.swift
new file mode 100644 (file)
index 0000000..1e52977
--- /dev/null
+++ b/KCD/HMKenzoHistory.swift
@@ -0,0 +1,26 @@
+//
+//  HMKenzoHistory.swift
+//  KCD
+//
+//  Created by Hori,Masaki on 2014/12/30.
+//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
+//
+
+import Foundation
+import CoreData
+
+class HMKenzoHistory: NSManagedObject {
+
+    @NSManaged var bauxite: NSNumber
+    @NSManaged var bull: NSNumber
+    @NSManaged var commanderLv: NSNumber
+    @NSManaged var date: NSDate
+    @NSManaged var flagShipLv: NSNumber
+    @NSManaged var flagShipName: String
+    @NSManaged var fuel: NSNumber
+    @NSManaged var kaihatusizai: NSNumber
+    @NSManaged var name: String
+    @NSManaged var steel: NSNumber
+    @NSManaged var sTypeId: NSNumber
+
+}

diff --git a/KCD/HMTSVSupport.m b/KCD/HMTSVSupport.m
index 5db2ecf..e9e3729 100644 (file)
--- a/KCD/HMTSVSupport.m
+++ b/KCD/HMTSVSupport.m
@@ -10,7 +10,6 @@
 
 #import "HMLocalDataStore.h"
 #import "HMKaihatuHistory.h"
-#import "HMKenzoHistory.h"
 
 #import "KCD-Swift.h"
 

diff --git a/KCD/LocalData.xcdatamodeld/LocalData.xcdatamodel/contents b/KCD/LocalData.xcdatamodeld/LocalData.xcdatamodel/contents
index bb27540..d48c91f 100644 (file)
--- a/KCD/LocalData.xcdatamodeld/LocalData.xcdatamodel/contents
+++ b/KCD/LocalData.xcdatamodeld/LocalData.xcdatamodel/contents
@@ -12,7 +12,7 @@
         <attribute name="name" attributeType="String" minValueString="1" indexed="YES" syncable="YES"/>
         <attribute name="steel" attributeType="Integer 32" minValueString="10" syncable="YES"/>
     </entity>
-    <entity name="KenzoHistory" representedClassName="HMKenzoHistory" syncable="YES">
+    <entity name="KenzoHistory" representedClassName="KCD.HMKenzoHistory" syncable="YES">
         <attribute name="bauxite" attributeType="Integer 32" minValueString="30" syncable="YES"/>
         <attribute name="bull" attributeType="Integer 32" minValueString="30" syncable="YES"/>
         <attribute name="commanderLv" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
@@ -39,7 +39,7 @@
     </entity>
     <elements>
         <element name="KaihatuHistory" positionX="0" positionY="63" width="128" height="193"/>
-        <element name="KenzoHistory" positionX="0" positionY="0" width="128" height="208"/>
+        <element name="KenzoHistory" positionX="0" positionY="0" width="128" height="210"/>
         <element name="KenzoMark" positionX="9" positionY="117" width="128" height="193"/>
     </elements>
 </model>
\ No newline at end of file