Doutakuを導入

[kcd/KCD.git] / KCD / AppDelegate.swift

diff --git a/KCD/AppDelegate.swift b/KCD/AppDelegate.swift
index 660a3d7..2cb4320 100644 (file)
--- a/KCD/AppDelegate.swift
+++ b/KCD/AppDelegate.swift
@@ -16,11 +16,11 @@ final class AppDelegate: NSObject {
         // swiftlint:disable:next force_cast
         return NSApplication.shared.delegate as! AppDelegate
     }
+        
+    let appNameForUserAgent: String = "KCD(1.9b36) is not Safari/604.4.7"
+    private(set) var fleetManager: FleetManager?
     
-    let appNameForUserAgent: String = "KCD(1.9b17) is not Safari/603.3.8"
-    let fleetManager: FleetManager = FleetManager()
-    
-    let windowManager = WindowManager()
+    private let windowManager = WindowManager()
     
     private let historyCleanNotifer = PeriodicNotifier(hour: 0, minutes: 7)
     private let jsonTracker = JSONTracker()
@@ -28,8 +28,8 @@ final class AppDelegate: NSObject {
     private let resourceHistory = ResourceHistoryManager()
     
     // MARK: - Variable
-    @IBOutlet var debugMenuItem: NSMenuItem!
-    @IBOutlet var billingWindowMenuItem: NSMenuItem!
+    @IBOutlet private var debugMenuItem: NSMenuItem!
+    @IBOutlet private var billingWindowMenuItem: NSMenuItem!
     
     var jsonViewWindowController: JSONViewWindowController? {
         
@@ -78,6 +78,8 @@ final class AppDelegate: NSObject {
         
         didLoadedMainMenu = true
         
+        fleetManager = FleetManager()
+        
         ValueTransformerRegister.registerAll()
         UserDefaults.standard.register(defaults: DefaultKeys.defaults)
         CustomHTTPProtocol.start()
@@ -109,11 +111,6 @@ final class AppDelegate: NSObject {
         return windowManager.createNewBrowser()
     }
     
-    func registerScreenshot(_ image: NSBitmapImageRep, fromOnScreen: NSRect) {
-        
-        windowManager.registerScreenshot(image, fromOnScreen: fromOnScreen)
-    }
-    
     @objc func fire(_ timer: Timer) {
         
         updaters.forEach { $0() }
@@ -172,8 +169,7 @@ extension AppDelegate {
         
         guard let path = Bundle.main.path(forResource: "RemoveDatabaseFileAndRestart", ofType: "app") else {
             
-            print("Can not find RemoveDatabaseFileAndRestart.app")
-            return
+            return Logger.shared.log("Can not find RemoveDatabaseFileAndRestart.app")
         }
         
         let process = Process()
@@ -294,7 +290,7 @@ private var objectForTouchBar: [Int: NSTouchBar] = [:]
 @available(OSX 10.12.2, *)
 extension AppDelegate: NSTouchBarProvider {
     
-    @IBOutlet var mainTouchBar: NSTouchBar? {
+    @IBOutlet private var mainTouchBar: NSTouchBar? {
         
         get { return objectForTouchBar[hash] }
         set { objectForTouchBar[hash] = newValue }