BookmarkManager.shared()メソッドをsharedプロパティに変更

diff --git a/KCD/BookmarkListViewController.swift b/KCD/BookmarkListViewController.swift
index c2a9c4e..bfb377f 100644 (file)
--- a/KCD/BookmarkListViewController.swift
+++ b/KCD/BookmarkListViewController.swift
@@ -20,7 +20,7 @@ extension NSPasteboard.PasteboardType {
 
 final class BookmarkListViewController: NSViewController {
     
-    @objc let managedObjectContext = BookmarkManager.shared().manageObjectContext
+    @objc let managedObjectContext = BookmarkManager.shared.manageObjectContext
     
     @IBOutlet var tableView: NSTableView!
     @IBOutlet var bookmarkController: NSArrayController!
@@ -148,7 +148,7 @@ extension BookmarkListViewController: NSTableViewDelegate, NSTableViewDataSource
         
         guard let items = info.draggingPasteboard().pasteboardItems else { return false }
         
-        let store = BookmarkManager.shared().editorStore
+        let store = BookmarkManager.shared.editorStore
         items.enumerated().forEach {
             
             guard let data = $0.element.data(forType: .bookmarkItem) else { return }

diff --git a/KCD/BookmarkManager.swift b/KCD/BookmarkManager.swift
index d9c19df..5fcb010 100644 (file)
--- a/KCD/BookmarkManager.swift
+++ b/KCD/BookmarkManager.swift
@@ -18,13 +18,7 @@ private enum BookmarkMenuTag: Int {
 
 final class BookmarkManager: NSObject, NSMenuDelegate {
     
-    private static let sharedInstance: BookmarkManager = BookmarkManager()
-    
-    class func shared() -> BookmarkManager {
-        
-        return sharedInstance
-    }
-    
+    static let shared = BookmarkManager()
     
     private override init() {
         

diff --git a/KCD/ExternalBrowserWindowController.swift b/KCD/ExternalBrowserWindowController.swift
index 796d9cd..fc84deb 100644 (file)
--- a/KCD/ExternalBrowserWindowController.swift
+++ b/KCD/ExternalBrowserWindowController.swift
@@ -247,7 +247,7 @@ extension ExternalBrowserWindowController {
     @IBAction func addBookmark(_ sender: AnyObject?) {
         
         guard let window = window else { return }
-        guard let bookmark = BookmarkManager.shared().createNewBookmark() else { return }
+        guard let bookmark = BookmarkManager.shared.createNewBookmark() else { return }
         
         bookmark.name = window.title
         bookmark.urlString = webView.mainFrameURL

diff --git a/KCD/WindowManager.swift b/KCD/WindowManager.swift
index a124c0d..113ecb5 100644 (file)
--- a/KCD/WindowManager.swift
+++ b/KCD/WindowManager.swift
@@ -110,7 +110,7 @@ final class WindowManager {
     
     func prepair() {
         
-        _ = BookmarkManager.shared()
+        _ = BookmarkManager.shared
         _ = screenshotListWindowController
         
         browserWindowController.showWindow(nil)