swift.yml を修正

diff --git a/.swiftlint.yml b/.swiftlint.yml
index 027aed5..8373599 100644 (file)
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -54,4 +54,4 @@ custom_rules:
                 regex: "NSManagedObjectContext\\s"
                 severity: error
         private_iboutlet:
-                regex: "@IBOutlet(?!.*private[(\\s])"
+                regex: "@IBOutlet\\s+(?!private[(\\s])"

diff --git a/KCD/AirBaseWindowController.swift b/KCD/AirBaseWindowController.swift
index 9157752..29b1ced 100644 (file)
--- a/KCD/AirBaseWindowController.swift
+++ b/KCD/AirBaseWindowController.swift
@@ -12,10 +12,10 @@ final class AirBaseWindowController: NSWindowController {
     
     @objc let managedObjectContext = ServerDataStore.default.context
     
-    @IBOutlet var areaMatrix: NSMatrix!
-    @IBOutlet var squadronTab: NSSegmentedControl!
-    @IBOutlet var planesTable: NSTableView!
-    @IBOutlet var airBaseController: NSArrayController!
+    @IBOutlet private var areaMatrix: NSMatrix!
+    @IBOutlet private var squadronTab: NSSegmentedControl!
+    @IBOutlet private var planesTable: NSTableView!
+    @IBOutlet private var airBaseController: NSArrayController!
     
     private var contentObservation: NSKeyValueObservation?
     

diff --git a/KCD/AirPlanInfoView.swift b/KCD/AirPlanInfoView.swift
index 4d5092d..e3e3481 100644 (file)
--- a/KCD/AirPlanInfoView.swift
+++ b/KCD/AirPlanInfoView.swift
@@ -22,9 +22,9 @@ final class AirPlanInfoView: NSTableCellView {
     static let maxCountBindingName = NSBindingName(#keyPath(AirPlanInfoView.maxCount))
     static let countBindingName = NSBindingName(#keyPath(AirPlanInfoView.count))
     
-    @IBOutlet var planNameVew: SlotItemLevelView!
-    @IBOutlet var conditionBox: NSBox!
-    @IBOutlet var needSupplyField: NSTextField!
+    @IBOutlet private var planNameVew: SlotItemLevelView!
+    @IBOutlet private var conditionBox: NSBox!
+    @IBOutlet private var needSupplyField: NSTextField!
     
     @objc dynamic var condition: Int = 1 {
         

diff --git a/KCD/AncherageRepairTimerViewController.swift b/KCD/AncherageRepairTimerViewController.swift
index bc32c4f..70236a3 100644 (file)
--- a/KCD/AncherageRepairTimerViewController.swift
+++ b/KCD/AncherageRepairTimerViewController.swift
@@ -15,7 +15,7 @@ final class AncherageRepairTimerViewController: NSViewController {
     
     private let anchorageRepairManager = AnchorageRepairManager.default
     
-    @IBOutlet var screenshotButton: NSButton!
+    @IBOutlet private var screenshotButton: NSButton!
     
     @objc dynamic var repairTime: NSNumber?
     

diff --git a/KCD/AppDelegate.swift b/KCD/AppDelegate.swift
index 39dbf97..fbd7c63 100644 (file)
--- a/KCD/AppDelegate.swift
+++ b/KCD/AppDelegate.swift
@@ -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? {
         

diff --git a/KCD/BridgeViewController.swift b/KCD/BridgeViewController.swift
index d65558e..a5f3493 100644 (file)
--- a/KCD/BridgeViewController.swift
+++ b/KCD/BridgeViewController.swift
@@ -15,7 +15,7 @@ protocol ScreenshotSharingProvider {
 
 class BridgeViewController: NSViewController {
     
-    @IBOutlet var arrayController: NSArrayController!
+    @IBOutlet private(set) var arrayController: NSArrayController!
     
     deinit {
         

diff --git a/KCD/BroserWindowController.swift b/KCD/BroserWindowController.swift
index 0dce0f7..b7db603 100644 (file)
--- a/KCD/BroserWindowController.swift
+++ b/KCD/BroserWindowController.swift
@@ -35,14 +35,14 @@ final class BroserWindowController: NSWindowController {
         NotificationCenter.default.removeObserver(self)
     }
     
-    @IBOutlet weak var placeholder: NSView!
-    @IBOutlet weak var combinedViewPlaceholder: NSView!
-    @IBOutlet weak var deckPlaceholder: NSView!
-    @IBOutlet weak var stokerContainer: NSView!
-    @IBOutlet weak var resourcePlaceholder: NSView!
-    @IBOutlet weak var ancherageRepariTimerPlaceholder: NSView!
-    @IBOutlet weak var informations: NSTabView!
-    @IBOutlet var deckContoller: NSArrayController!
+    @IBOutlet private weak var placeholder: NSView!
+    @IBOutlet private weak var combinedViewPlaceholder: NSView!
+    @IBOutlet private weak var deckPlaceholder: NSView!
+    @IBOutlet private weak var stokerContainer: NSView!
+    @IBOutlet private weak var resourcePlaceholder: NSView!
+    @IBOutlet private weak var ancherageRepariTimerPlaceholder: NSView!
+    @IBOutlet private weak var informations: NSTabView!
+    @IBOutlet private var deckContoller: NSArrayController!
     
     override var windowNibName: NSNib.Name {
         

diff --git a/KCD/DocksViewController.swift b/KCD/DocksViewController.swift
index 96cc481..a54e207 100644 (file)
--- a/KCD/DocksViewController.swift
+++ b/KCD/DocksViewController.swift
@@ -44,8 +44,8 @@ final class DocksViewController: MainTabVIewItemViewController {
     @objc dynamic var mission3Name: String?
     @objc dynamic var mission4Name: String?
     
-    @IBOutlet weak var battleInformationViewPlaceholder: NSView!
-    @IBOutlet weak var questListViewPlaceholder: NSView!
+    @IBOutlet private weak var battleInformationViewPlaceholder: NSView!
+    @IBOutlet private weak var questListViewPlaceholder: NSView!
     
     override var nibName: NSNib.Name {
         

diff --git a/KCD/ExternalBrowserWindowController.swift b/KCD/ExternalBrowserWindowController.swift
index 5e7626f..aee795f 100644 (file)
--- a/KCD/ExternalBrowserWindowController.swift
+++ b/KCD/ExternalBrowserWindowController.swift
@@ -11,9 +11,9 @@ import WebKit
 
 final class ExternalBrowserWindowController: NSWindowController {
         
-    @IBOutlet var webView: WebView!
-    @IBOutlet var goSegment: NSSegmentedControl!
-    @IBOutlet var bookmarkListView: NSView!
+    @IBOutlet private var webView: WebView!
+    @IBOutlet private var goSegment: NSSegmentedControl!
+    @IBOutlet private var bookmarkListView: NSView!
     
     private var canGoBackObservation: NSKeyValueObservation?
     private var canGoForwardObservation: NSKeyValueObservation?

diff --git a/KCD/FleetViewController.swift b/KCD/FleetViewController.swift
index 6d6569c..98b0778 100644 (file)
--- a/KCD/FleetViewController.swift
+++ b/KCD/FleetViewController.swift
@@ -102,12 +102,12 @@ final class FleetViewController: NSViewController {
         NotificationCenter.default.removeObserver(self)
     }
     
-    @IBOutlet weak var placeholder01: NSView!
-    @IBOutlet weak var placeholder02: NSView!
-    @IBOutlet weak var placeholder03: NSView!
-    @IBOutlet weak var placeholder04: NSView!
-    @IBOutlet weak var placeholder05: NSView!
-    @IBOutlet weak var placeholder06: NSView!
+    @IBOutlet private weak var placeholder01: NSView!
+    @IBOutlet private weak var placeholder02: NSView!
+    @IBOutlet private weak var placeholder03: NSView!
+    @IBOutlet private weak var placeholder04: NSView!
+    @IBOutlet private weak var placeholder05: NSView!
+    @IBOutlet private weak var placeholder06: NSView!
     
     @objc dynamic var fleetNumber: Int = 1 {
         

diff --git a/KCD/GameViewController.swift b/KCD/GameViewController.swift
index 468c99c..fb6d720 100644 (file)
--- a/KCD/GameViewController.swift
+++ b/KCD/GameViewController.swift
@@ -15,7 +15,7 @@ final class GameViewController: NSViewController {
     private static let gamePageURL = "http://www.dmm.com/netgame/social/-/gadgets/=/app_id=854854/"
     private static let loginPageURLPrefix = "https://www.dmm.com/my/-/login/=/"
     
-    @IBOutlet var webView: WebView!
+    @IBOutlet private var webView: WebView!
     
     override var nibName: NSNib.Name {
         

diff --git a/KCD/HistoryWindowController.swift b/KCD/HistoryWindowController.swift
index eb36ce2..de5ce8f 100644 (file)
--- a/KCD/HistoryWindowController.swift
+++ b/KCD/HistoryWindowController.swift
@@ -19,12 +19,12 @@ final class HistoryWindowController: NSWindowController {
     
     @objc let manageObjectContext = LocalDataStore.default.context
     
-    @IBOutlet var tabView: NSTabView!
-    @IBOutlet var kaihatsuTableVC: KaihatsuHistoryTableViewController!
-    @IBOutlet var kenzoTableVC: KenzoHistoryTableViewController!
-    @IBOutlet var dropShipTableVC: DropShipHistoryTableViewController!
+    @IBOutlet private var tabView: NSTabView!
+    @IBOutlet private var kaihatsuTableVC: KaihatsuHistoryTableViewController!
+    @IBOutlet private var kenzoTableVC: KenzoHistoryTableViewController!
+    @IBOutlet private var dropShipTableVC: DropShipHistoryTableViewController!
     
-    @IBOutlet var searchField: NSSearchField!
+    @IBOutlet private var searchField: NSSearchField!
     
     private var currentSelection: HistoryTableViewController? {
         

diff --git a/KCD/PowerUpSupportViewController.swift b/KCD/PowerUpSupportViewController.swift
index 1ce76f8..31c6c03 100644 (file)
--- a/KCD/PowerUpSupportViewController.swift
+++ b/KCD/PowerUpSupportViewController.swift
@@ -12,8 +12,8 @@ final class PowerUpSupportViewController: MainTabVIewItemViewController {
     
     @objc let managedObjectContext = ServerDataStore.default.context
     
-    @IBOutlet var shipController: NSArrayController!
-    @IBOutlet weak var typeSegment: NSSegmentedControl!
+    @IBOutlet private var shipController: NSArrayController!
+    @IBOutlet private weak var typeSegment: NSSegmentedControl!
     
     private var sortDescriptorsObservation: NSKeyValueObservation?
     

diff --git a/KCD/PreferencePanelController.swift b/KCD/PreferencePanelController.swift
index d3f3478..eea11be 100644 (file)
--- a/KCD/PreferencePanelController.swift
+++ b/KCD/PreferencePanelController.swift
@@ -27,9 +27,9 @@ private extension Selector {
 
 final class PreferencePanelController: NSWindowController {
     
-    @IBOutlet var screenShotSaveDirectoryPopUp: NSPopUpButton!
-    @IBOutlet var generalPane: NSView!
-    @IBOutlet var notificationPane: NSView!
+    @IBOutlet private var screenShotSaveDirectoryPopUp: NSPopUpButton!
+    @IBOutlet private var generalPane: NSView!
+    @IBOutlet private var notificationPane: NSView!
     
     override var windowNibName: NSNib.Name {
         

diff --git a/KCD/ScreenshotCollectionViewItem.swift b/KCD/ScreenshotCollectionViewItem.swift
index 2a6c75e..c981e09 100644 (file)
--- a/KCD/ScreenshotCollectionViewItem.swift
+++ b/KCD/ScreenshotCollectionViewItem.swift
@@ -11,9 +11,9 @@ import Quartz
 
 final class ScreenshotCollectionViewItem: NSCollectionViewItem {
     
-    @IBOutlet weak var imageBox: NSBox!
-    @IBOutlet weak var nameField: NSTextField!
-    @IBOutlet weak var nameBox: NSBox!
+    @IBOutlet private weak var imageBox: NSBox!
+    @IBOutlet private weak var nameField: NSTextField!
+    @IBOutlet private weak var nameBox: NSBox!
     
     var info: ScreenshotInformation? {
         

diff --git a/KCD/ScreenshotDetailViewController.swift b/KCD/ScreenshotDetailViewController.swift
index 09ab528..d79cd52 100644 (file)
--- a/KCD/ScreenshotDetailViewController.swift
+++ b/KCD/ScreenshotDetailViewController.swift
@@ -10,7 +10,7 @@ import Cocoa
 
 final class ScreenshotDetailViewController: BridgeViewController {
     
-    @IBOutlet var imageView: ImageView!
+    @IBOutlet private var imageView: ImageView!
     
     override var nibName: NSNib.Name {
         

diff --git a/KCD/ScreenshotEditorViewController.swift b/KCD/ScreenshotEditorViewController.swift
index bceaafc..f6e626b 100644 (file)
--- a/KCD/ScreenshotEditorViewController.swift
+++ b/KCD/ScreenshotEditorViewController.swift
@@ -54,8 +54,8 @@ final class ScreenshotEditorViewController: BridgeViewController {
     }
     
     
-    @IBOutlet weak var tiledImageView: TiledImageView!
-    @IBOutlet weak var doneButton: NSButton!
+    @IBOutlet private weak var tiledImageView: TiledImageView!
+    @IBOutlet private weak var doneButton: NSButton!
     
     @objc var columnCount: Int {
         

diff --git a/KCD/ScreenshotListViewController.swift b/KCD/ScreenshotListViewController.swift
index 487871c..9bf37bf 100644 (file)
--- a/KCD/ScreenshotListViewController.swift
+++ b/KCD/ScreenshotListViewController.swift
@@ -21,8 +21,8 @@ final class ScreenshotListViewController: NSViewController {
     
     var screenshots: ScreenshotModel = ScreenshotModel()
     
-    @IBOutlet var screenshotsController: NSArrayController!
-    @IBOutlet weak var collectionView: NSCollectionView!
+    @IBOutlet private var screenshotsController: NSArrayController!
+    @IBOutlet private weak var collectionView: NSCollectionView!
     
     private var selectionObservation: NSKeyValueObservation?
     

diff --git a/KCD/ScreenshotListWindowController.swift b/KCD/ScreenshotListWindowController.swift
index b52cc3e..ad5ad5c 100644 (file)
--- a/KCD/ScreenshotListWindowController.swift
+++ b/KCD/ScreenshotListWindowController.swift
@@ -10,10 +10,10 @@ import Cocoa
 
 final class ScreenshotListWindowController: NSWindowController {
     
-    @IBOutlet weak var shareButton: NSButton!
-    @IBOutlet var rightController: NSViewController!
-    @IBOutlet weak var left: NSView!
-    @IBOutlet weak var right: NSView!
+    @IBOutlet private weak var shareButton: NSButton!
+    @IBOutlet private var rightController: NSViewController!
+    @IBOutlet private weak var left: NSView!
+    @IBOutlet private weak var right: NSView!
     
     private lazy var detailViewController: ScreenshotDetailViewController = {
         return ScreenshotDetailViewController()

diff --git a/KCD/ShipDetailViewController.swift b/KCD/ShipDetailViewController.swift
index 951debc..bb05e0d 100644 (file)
--- a/KCD/ShipDetailViewController.swift
+++ b/KCD/ShipDetailViewController.swift
@@ -55,13 +55,13 @@ final class ShipDetailViewController: NSViewController {
             .forEach { $0?.unbind(NSBindingName(#keyPath(SlotItemLevelView.slotItemID))) }
     }
     
-    @IBOutlet weak var supply: SuppliesView!
-    @IBOutlet weak var guardEscapedView: GuardEscapedView!
-    @IBOutlet weak var damageView: DamageView!
-    @IBOutlet weak var slot00Field: SlotItemLevelView!
-    @IBOutlet weak var slot01Field: SlotItemLevelView!
-    @IBOutlet weak var slot02Field: SlotItemLevelView!
-    @IBOutlet weak var slot03Field: SlotItemLevelView!
+    @IBOutlet private weak var supply: SuppliesView!
+    @IBOutlet private weak var guardEscapedView: GuardEscapedView!
+    @IBOutlet private weak var damageView: DamageView!
+    @IBOutlet private weak var slot00Field: SlotItemLevelView!
+    @IBOutlet private weak var slot01Field: SlotItemLevelView!
+    @IBOutlet private weak var slot02Field: SlotItemLevelView!
+    @IBOutlet private weak var slot03Field: SlotItemLevelView!
     
     var observer: ShipSlotObserver?
     

diff --git a/KCD/ShipMasterDetailWindowController.swift b/KCD/ShipMasterDetailWindowController.swift
index 3503a6a..a62547d 100644 (file)
--- a/KCD/ShipMasterDetailWindowController.swift
+++ b/KCD/ShipMasterDetailWindowController.swift
@@ -22,11 +22,11 @@ final class ShipMasterDetailWindowController: NSWindowController {
         "leng", "slot_ex", "sakuteki_0", "sakuteki_1"
     ]
     
-    @IBOutlet var shipController: NSArrayController!
-    @IBOutlet var fleetMemberController: NSArrayController!
-    @IBOutlet weak var shipsView: NSTableView!
-    @IBOutlet weak var fleetMemberView: NSTableView!
-    @IBOutlet weak var sally: NSTextField!
+    @IBOutlet private var shipController: NSArrayController!
+    @IBOutlet private var fleetMemberController: NSArrayController!
+    @IBOutlet private weak var shipsView: NSTableView!
+    @IBOutlet private weak var fleetMemberView: NSTableView!
+    @IBOutlet private weak var sally: NSTextField!
     
     override var windowNibName: NSNib.Name {
         

diff --git a/KCD/ShipViewController.swift b/KCD/ShipViewController.swift
index ec7da25..f686c69 100644 (file)
--- a/KCD/ShipViewController.swift
+++ b/KCD/ShipViewController.swift
@@ -25,12 +25,12 @@ final class ShipViewController: MainTabVIewItemViewController {
         NotificationCenter.default.removeObserver(self)
     }
     
-    @IBOutlet var shipController: NSArrayController!
-    @IBOutlet var expTableView: NSScrollView!
-    @IBOutlet var powerTableView: NSScrollView!
-    @IBOutlet var power2TableView: NSScrollView!
-    @IBOutlet var power3TableView: NSScrollView!
-    @IBOutlet weak var standardDeviationField: NSTextField!
+    @IBOutlet private var shipController: NSArrayController!
+    @IBOutlet private var expTableView: NSScrollView!
+    @IBOutlet private var powerTableView: NSScrollView!
+    @IBOutlet private var power2TableView: NSScrollView!
+    @IBOutlet private var power3TableView: NSScrollView!
+    @IBOutlet private weak var standardDeviationField: NSTextField!
     
     private var sortDescriptorsObservation: NSKeyValueObservation?
     private var arrangedObjectsObservation: NSKeyValueObservation?

diff --git a/KCD/SlotItemWindowController.swift b/KCD/SlotItemWindowController.swift
index b41eb6e..27b2b91 100644 (file)
--- a/KCD/SlotItemWindowController.swift
+++ b/KCD/SlotItemWindowController.swift
@@ -19,8 +19,8 @@ final class SlotItemWindowController: NSWindowController {
     
     @objc let managedObjectContext = ServerDataStore.default.context
     
-    @IBOutlet var slotItemController: NSArrayController!
-    @IBOutlet var searchField: NSSearchField!
+    @IBOutlet private var slotItemController: NSArrayController!
+    @IBOutlet private var searchField: NSSearchField!
     
     override var windowNibName: NSNib.Name {
         

diff --git a/KCD/StrengthenListViewController.swift b/KCD/StrengthenListViewController.swift
index 25f7608..75deb8e 100644 (file)
--- a/KCD/StrengthenListViewController.swift
+++ b/KCD/StrengthenListViewController.swift
@@ -65,7 +65,7 @@ private struct FilterCategories {
 
 final class StrengthenListViewController: MainTabVIewItemViewController {
     
-    @IBOutlet weak var tableView: NSTableView!
+    @IBOutlet private weak var tableView: NSTableView!
     
     @objc dynamic var itemList: Any { return filteredItems as Any }
     @objc dynamic var offsetDay: Int = 0 {

diff --git a/KCD/UITestWindowController.swift b/KCD/UITestWindowController.swift
index e61cdf1..f6c8695 100644 (file)
--- a/KCD/UITestWindowController.swift
+++ b/KCD/UITestWindowController.swift
@@ -10,7 +10,7 @@ import Cocoa
 
 final class UITestWindowController: NSWindowController {
     
-    @IBOutlet var testViewPlaceholder: NSView!
+    @IBOutlet private var testViewPlaceholder: NSView!
     
     override var windowNibName: NSNib.Name {
         

diff --git a/KCD/UpgradableShipsWindowController.swift b/KCD/UpgradableShipsWindowController.swift
index 71883b3..6358161 100644 (file)
--- a/KCD/UpgradableShipsWindowController.swift
+++ b/KCD/UpgradableShipsWindowController.swift
@@ -41,9 +41,9 @@ final class UpgradableShipsWindowController: NSWindowController {
     }
     
     
-    @IBOutlet var contextualMenu: NSMenu!
-    @IBOutlet var tableView: NSTableView!
-    @IBOutlet var shipsController: NSArrayController!
+    @IBOutlet private var contextualMenu: NSMenu!
+    @IBOutlet private var tableView: NSTableView!
+    @IBOutlet private var shipsController: NSArrayController!
     
     override var windowNibName: NSNib.Name {