HMRepairListViewControllerをSwiftに変換した

diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj
index a13e3c9..63ebe19 100644 (file)
--- a/KCD.xcodeproj/project.pbxproj
+++ b/KCD.xcodeproj/project.pbxproj
@@ -231,7 +231,6 @@
                F4C668721C54525300601AFB /* HMCombileViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4C668741C54525300601AFB /* HMCombileViewController.xib */; };
                F4C668781C54592300601AFB /* HMEquipmentWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F4C668761C54592300601AFB /* HMEquipmentWindowController.m */; };
                F4C6687D1C545E3800601AFB /* HMMapWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F4C6687B1C545E3800601AFB /* HMMapWindowController.m */; };
-               F4C668881C60F5F200601AFB /* HMRepairListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F4C668861C60F5F200601AFB /* HMRepairListViewController.m */; };
                F4C86B921C1C445D00F260FE /* HMUpgradeShipExcludeColorTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = F4C86B911C1C445D00F260FE /* HMUpgradeShipExcludeColorTransformer.m */; };
                F4D05BC61E0ABD6800688D66 /* HMSlotItemWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D05BC51E0ABD6800688D66 /* HMSlotItemWindowController.swift */; };
                F4D05BC81E0C0DA100688D66 /* HMAirBaseWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D05BC71E0C0DA100688D66 /* HMAirBaseWindowController.swift */; };
@@ -241,6 +240,7 @@
                F4D05BD01E0D667600688D66 /* HMBookmarkListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D05BCF1E0D667600688D66 /* HMBookmarkListViewController.swift */; };
                F4D05BD21E0F3C4E00688D66 /* HMCombileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D05BD11E0F3C4E00688D66 /* HMCombileViewController.swift */; };
                F4D05BD41E0F4F8500688D66 /* HMShipDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D05BD31E0F4F8500688D66 /* HMShipDetailViewController.swift */; };
+               F4D05BD71E0F696C00688D66 /* HMRepairListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D05BD61E0F696C00688D66 /* HMRepairListViewController.swift */; };
                F4D2CBC218AD0E1A000EBC59 /* HMMasterSTypeCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4D2CBC118AD0E1A000EBC59 /* HMMasterSTypeCommand.m */; };
                F4D2CBC518AE2AE2000EBC59 /* HMCompositCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4D2CBC418AE2AE2000EBC59 /* HMCompositCommand.m */; };
                F4D2CBC818B0555A000EBC59 /* HMKCManagedObject.m in Sources */ = {isa = PBXBuildFile; fileRef = F4D2CBC718B0555A000EBC59 /* HMKCManagedObject.m */; };
@@ -693,8 +693,6 @@
                F4C668761C54592300601AFB /* HMEquipmentWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMEquipmentWindowController.m; sourceTree = "<group>"; };
                F4C6687A1C545E3700601AFB /* HMMapWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMapWindowController.h; sourceTree = "<group>"; };
                F4C6687B1C545E3800601AFB /* HMMapWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMapWindowController.m; sourceTree = "<group>"; };
-               F4C668851C60F5F200601AFB /* HMRepairListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMRepairListViewController.h; sourceTree = "<group>"; };
-               F4C668861C60F5F200601AFB /* HMRepairListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMRepairListViewController.m; sourceTree = "<group>"; };
                F4C86B901C1C445C00F260FE /* HMUpgradeShipExcludeColorTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMUpgradeShipExcludeColorTransformer.h; sourceTree = "<group>"; };
                F4C86B911C1C445D00F260FE /* HMUpgradeShipExcludeColorTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMUpgradeShipExcludeColorTransformer.m; sourceTree = "<group>"; };
                F4D05BC51E0ABD6800688D66 /* HMSlotItemWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMSlotItemWindowController.swift; sourceTree = "<group>"; };
@@ -706,6 +704,7 @@
                F4D05BD11E0F3C4E00688D66 /* HMCombileViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMCombileViewController.swift; sourceTree = "<group>"; };
                F4D05BD31E0F4F8500688D66 /* HMShipDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMShipDetailViewController.swift; sourceTree = "<group>"; };
                F4D05BD51E0F605400688D66 /* TemporaryEnumDefined.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TemporaryEnumDefined.h; sourceTree = "<group>"; };
+               F4D05BD61E0F696C00688D66 /* HMRepairListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMRepairListViewController.swift; sourceTree = "<group>"; };
                F4D2CBC018AD0E1A000EBC59 /* HMMasterSTypeCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMasterSTypeCommand.h; sourceTree = "<group>"; };
                F4D2CBC118AD0E1A000EBC59 /* HMMasterSTypeCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMasterSTypeCommand.m; sourceTree = "<group>"; };
                F4D2CBC318AE2AE2000EBC59 /* HMCompositCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMCompositCommand.h; sourceTree = "<group>"; };
@@ -1394,8 +1393,7 @@
                                F4C5A2251C36C68C00533FB6 /* HMStrengthenListItemView.m */,
                                F4C5A2211C3533E800533FB6 /* HMEnhancementListItem.h */,
                                F4C5A2221C3533E800533FB6 /* HMEnhancementListItem.m */,
-                               F4C668851C60F5F200601AFB /* HMRepairListViewController.h */,
-                               F4C668861C60F5F200601AFB /* HMRepairListViewController.m */,
+                               F4D05BD61E0F696C00688D66 /* HMRepairListViewController.swift */,
                                F4F947211D5DBBC700F95998 /* HMRepairListViewController.xib */,
                                F4D05BD31E0F4F8500688D66 /* HMShipDetailViewController.swift */,
                                F4BEF00A1B11A5DE004702B8 /* HMShipDetailViewController.xib */,
@@ -1963,6 +1961,7 @@
                                F43769E41AE7D01D00DE6204 /* HMUpdateQuestListCommand.m in Sources */,
                                F4C1190818A746EB005D5B25 /* HMJSONTracker.m in Sources */,
                                F4B3DC4718EEEB920011B4FC /* HMStart2Command.m in Sources */,
+                               F4D05BD71E0F696C00688D66 /* HMRepairListViewController.swift in Sources */,
                                F4F6E82B1B3045970008B66E /* CustomHTTPProtocol.m in Sources */,
                                F4513EDD18B619B600073552 /* HMCoreDataManager.m in Sources */,
                                F4E90B5E1DE713FF00643B5F /* HMSetPlaneCommand.m in Sources */,
@@ -2002,7 +2001,6 @@
                                F4D6BC9C1AA1FAC700742FEB /* HMUITestWindowController.m in Sources */,
                                F4B1E30C19D1C06900805879 /* HMHokyuChargeCommand.m in Sources */,
                                F494DC6318C608C100AE97E4 /* HMShipViewController.m in Sources */,
-                               F4C668881C60F5F200601AFB /* HMRepairListViewController.m in Sources */,
                                F46F104918ABAC910063E503 /* KCD.xcdatamodeld in Sources */,
                                F4B414FE18B3A66200468DAF /* HMMemberNDockCommand.m in Sources */,
                                F4C2ACA51D7167C2007BFE90 /* HMTimeSignalNotifier.m in Sources */,

diff --git a/KCD/HMBroserWindowController.m b/KCD/HMBroserWindowController.m
index a19ab72..c984b21 100644 (file)
--- a/KCD/HMBroserWindowController.m
+++ b/KCD/HMBroserWindowController.m
@@ -20,7 +20,6 @@
 #import "HMCombinedCommand.h"
 #import "HMFleetViewController.h"
 #import "HMResourceViewController.h"
-#import "HMRepairListViewController.h"
 #import "HMAncherageRepairTimerViewController.h"
 
 

diff --git a/KCD/HMRepairListViewController.h b/KCD/HMRepairListViewController.h
deleted file mode 100644 (file)
index 7432131..0000000
--- a/KCD/HMRepairListViewController.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-//  HMRepairListViewController.h
-//  KCD
-//
-//  Created by Hori,Masaki on 2016/02/02.
-//  Copyright © 2016年 Hori,Masaki. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-#import "HMMainTabVIewItemViewController.h"
-
-@interface HMRepairListViewController : HMMainTabVIewItemViewController
-
-@end

diff --git a/KCD/HMRepairListViewController.m b/KCD/HMRepairListViewController.m
deleted file mode 100644 (file)
index f160f56..0000000
--- a/KCD/HMRepairListViewController.m
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-//  HMRepairListViewController.m
-//  KCD
-//
-//  Created by Hori,Masaki on 2016/02/02.
-//  Copyright © 2016年 Hori,Masaki. All rights reserved.
-//
-
-#import "HMRepairListViewController.h"
-
-#import "HMServerDataStore.h"
-
-@interface HMRepairListViewController ()
-@property (readonly) NSManagedObjectContext *managedObjectContext;
-@property (readonly) NSPredicate *fetchPredicate;
-@end
-
-@implementation HMRepairListViewController
-- (NSManagedObjectContext *)managedObjectContext
-{
-       return [HMServerDataStore defaultManager].managedObjectContext;
-}
-- (NSPredicate *)fetchPredicate
-{
-       return [NSPredicate predicateWithFormat:@"NOT ndock_time is %@", @0];
-}
-@end

diff --git a/KCD/HMRepairListViewController.swift b/KCD/HMRepairListViewController.swift
new file mode 100644 (file)
index 0000000..9399978
--- /dev/null
+++ b/KCD/HMRepairListViewController.swift
@@ -0,0 +1,18 @@
+//
+//  HMRepairListViewController.swift
+//  KCD
+//
+//  Created by Hori,Masaki on 2016/12/25.
+//  Copyright © 2016年 Hori,Masaki. All rights reserved.
+//
+
+import Cocoa
+
+class HMRepairListViewController: HMMainTabVIewItemViewController {
+    override var nibName: String! {
+        return "HMRepairListViewController"
+    }
+    let managedObjectContext = HMServerDataStore.default().managedObjectContext
+    let fetchPredicate = NSPredicate(format: "NOT ndock_time = %@", argumentArray: [0])
+    
+}

diff --git a/KCD/KCD-Bridging-Header.h b/KCD/KCD-Bridging-Header.h
index 451fe25..0b5da39 100644 (file)
--- a/KCD/KCD-Bridging-Header.h
+++ b/KCD/KCD-Bridging-Header.h
@@ -7,6 +7,8 @@
 
 // UI
 #import "HMFleetViewController.h"
+#import "HMMainTabVIewItemViewController.h"
+
 
 #import "HMSuppliesView.h"
 #import "HMGuardEscapedView.h"