定数の初期化方法を変更

イニシャライザ内でなく、定数に直接代入するようにした

diff --git a/KCD/AnchorageRepairManager.swift b/KCD/AnchorageRepairManager.swift
index db60452..9581519 100644 (file)
--- a/KCD/AnchorageRepairManager.swift
+++ b/KCD/AnchorageRepairManager.swift
@@ -13,13 +13,11 @@ final class AnchorageRepairManager: NSObject {
     
     static let `default`: AnchorageRepairManager = AnchorageRepairManager()
     
-    private let fleetManager: FleetManager
+    private let fleetManager = AppDelegate.shared.fleetManager
     private let repairShipTypeIds: [Int] = [19]
     
     override init() {
-        
-        fleetManager = AppDelegate.shared.fleetManager
-        
+                
         super.init()
         
         let nc = NotificationCenter.default
@@ -67,8 +65,7 @@ final class AnchorageRepairManager: NSObject {
     
     private func shipTypeId(shipId: Int) -> Int? {
         
-        return ServerDataStore.default
-            .ship(by: shipId)?.master_ship.stype.id
+        return ServerDataStore.default.ship(by: shipId)?.master_ship.stype.id
     }
     
     private func needsReset(info: HenseiDidChangeUserInfo) -> Bool {

diff --git a/KCD/BookmarkManager.swift b/KCD/BookmarkManager.swift
index 319b83c..d9c19df 100644 (file)
--- a/KCD/BookmarkManager.swift
+++ b/KCD/BookmarkManager.swift
@@ -25,12 +25,9 @@ final class BookmarkManager: NSObject, NSMenuDelegate {
         return sharedInstance
     }
     
-    private let bookmarksController: NSArrayController
     
     private override init() {
         
-        bookmarksController = NSArrayController()
-        
         super.init()
         
         bookmarksController.managedObjectContext = self.manageObjectContext
@@ -45,9 +42,11 @@ final class BookmarkManager: NSObject, NSMenuDelegate {
         buildBookmarkMenu()
     }
     
-    private(set) var editorStore: BookmarkDataStore = BookmarkDataStore.oneTimeEditor()
+    let editorStore: BookmarkDataStore = BookmarkDataStore.oneTimeEditor()
+    let manageObjectContext = BookmarkDataStore.default.context
+    private let bookmarksController = NSArrayController()
+    
     private var bookmarkMenu: NSMenu!
-    var manageObjectContext = BookmarkDataStore.default.context
     
     var bookmarks: [Bookmark] {
         

diff --git a/KCD/Fleet.swift b/KCD/Fleet.swift
index 2d4ef36..430147c 100644 (file)
--- a/KCD/Fleet.swift
+++ b/KCD/Fleet.swift
@@ -13,6 +13,7 @@ private var pDeckContext = 0
 final class Fleet: NSObject {
     
     let fleetNumber: Int
+    private let deckController = NSObjectController()
     
     private let deckObserveKeys = [
         "selection.ship_0", "selection.ship_1", "selection.ship_2",
@@ -28,7 +29,6 @@ final class Fleet: NSObject {
         }
         
         fleetNumber = number
-        deckController = NSObjectController()
         
         super.init()
         
@@ -74,7 +74,6 @@ final class Fleet: NSObject {
     }
     
     @objc dynamic private(set) var ships: [Ship] = []
-    private let deckController: NSObjectController
     @objc weak var deck: Deck?
     
     @objc dynamic var name: String? { return deck?.name }

diff --git a/KCD/KenzoDockStatus.swift b/KCD/KenzoDockStatus.swift
index 0b5cc1a..ff9ca9f 100644 (file)
--- a/KCD/KenzoDockStatus.swift
+++ b/KCD/KenzoDockStatus.swift
@@ -19,7 +19,7 @@ private enum DockState: Int {
 final class KenzoDockStatus: NSObject {
     
     private let number: Int
-    private let controller: NSArrayController
+    private let controller = NSArrayController()
     private var isTasking = false
     private var didNotify = false
     private var realTime: TimeInterval = 0.0 {
@@ -39,7 +39,6 @@ final class KenzoDockStatus: NSObject {
         guard case 1...4 = number else { return nil }
         
         self.number = number
-        controller = NSArrayController()
         
         super.init()
         

diff --git a/KCD/MissionStatus.swift b/KCD/MissionStatus.swift
index 643739e..ea82936 100644 (file)
--- a/KCD/MissionStatus.swift
+++ b/KCD/MissionStatus.swift
@@ -20,7 +20,7 @@ private enum State: Int {
 final class MissionStatus: NSObject {
     
     private let number: Int
-    private let controller: NSArrayController
+    private let controller = NSArrayController()
     private var didNotify = false
     private var realTime: TimeInterval = 0.0 {
         
@@ -42,7 +42,6 @@ final class MissionStatus: NSObject {
         guard case 2...4 = number else { return nil }
         
         self.number = number
-        controller = NSArrayController()
         
         super.init()
         

diff --git a/KCD/NyukyoDockStatus.swift b/KCD/NyukyoDockStatus.swift
index 29884d8..423cb26 100644 (file)
--- a/KCD/NyukyoDockStatus.swift
+++ b/KCD/NyukyoDockStatus.swift
@@ -17,7 +17,7 @@ private enum DockState: Int {
 final class NyukyoDockStatus: NSObject {
     
     private let number: Int
-    private let controller: NSArrayController
+    private let controller = NSArrayController()
     private var didNotify = false
     private var realTime: TimeInterval = 0.0 {
         
@@ -41,7 +41,6 @@ final class NyukyoDockStatus: NSObject {
         guard case 1...4 = number else { return nil }
         
         self.number = number
-        controller = NSArrayController()
         
         super.init()
         

diff --git a/KCD/ResourceHistoryManager.swift b/KCD/ResourceHistoryManager.swift
index 01b7068..af4674e 100644 (file)
--- a/KCD/ResourceHistoryManager.swift
+++ b/KCD/ResourceHistoryManager.swift
@@ -15,12 +15,10 @@ private extension Selector {
 
 final class ResourceHistoryManager: NSObject {
     
-    private let periodicNotification: PeriodicNotifier
+    private let periodicNotification = PeriodicNotifier(hour: 23, minutes: 3)
     
     override init() {
         
-        periodicNotification = PeriodicNotifier(hour: 23, minutes: 3)
-        
         super.init()
         
         notifyIfNeeded(nil)

diff --git a/KCD/StrokeTextFieldCell.swift b/KCD/StrokeTextFieldCell.swift
index 87f92bf..9573ce2 100644 (file)
--- a/KCD/StrokeTextFieldCell.swift
+++ b/KCD/StrokeTextFieldCell.swift
@@ -12,14 +12,11 @@ final class StrokeTextFieldCell: NSTextFieldCell {
     
     private static let boarderWidth: CGFloat = 2.0
     
-    private let layoutManager: NSLayoutManager
-    private let textContainer: NSTextContainer
+    private let layoutManager = NSLayoutManager()
+    private let textContainer = NSTextContainer()
     
     required init(coder: NSCoder) {
-        
-        layoutManager = NSLayoutManager()
-        textContainer = NSTextContainer()
-        
+                
         super.init(coder: coder)
         
         layoutManager.addTextContainer(textContainer)

diff --git a/KCD/TiledImageView.swift b/KCD/TiledImageView.swift
index 2397cd9..ea2e40a 100644 (file)
--- a/KCD/TiledImageView.swift
+++ b/KCD/TiledImageView.swift
@@ -22,9 +22,10 @@ final class TiledImageView: NSView {
     
     private static let privateDraggingUTI = "com.masakih.KCD.ScreenshotDDImte"
     
+    private let imageCell = NSImageCell()
+    
     required init?(coder: NSCoder) {
         
-        imageCell = NSImageCell()
         imageCell.imageAlignment = .alignCenter
         imageCell.imageScaling = .scaleProportionallyDown
         
@@ -70,8 +71,6 @@ final class TiledImageView: NSView {
     
     private var currentSelection: TitledImageCellInformation?
     
-    private var imageCell: NSImageCell
-    
     override func draw(_ dirtyRect: NSRect) {
         
         NSColor.controlBackgroundColor.setFill()