From 1a9acdcc50683dd9e7eaca0009a6e732c86339a9 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sun, 1 Sep 2019 14:56:27 -0500 Subject: [PATCH] Remove TreeController from Delete command as it is no longer used there --- Mac/MainWindow/Sidebar/SidebarViewController.swift | 2 +- Shared/Commands/DeleteCommand.swift | 4 +--- iOS/MasterFeed/MasterFeedViewController.swift | 2 +- iOS/SceneCoordinator.swift | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Mac/MainWindow/Sidebar/SidebarViewController.swift b/Mac/MainWindow/Sidebar/SidebarViewController.swift index a2991ec01..bf5dc2ca8 100644 --- a/Mac/MainWindow/Sidebar/SidebarViewController.swift +++ b/Mac/MainWindow/Sidebar/SidebarViewController.swift @@ -281,7 +281,7 @@ protocol SidebarDelegate: class { func deleteNodes(_ nodes: [Node]) { let nodesToDelete = treeController.normalizedSelectedNodes(nodes) - guard let undoManager = undoManager, let deleteCommand = DeleteCommand(nodesToDelete: nodesToDelete, treeController: treeController, undoManager: undoManager, errorHandler: ErrorHandler.present) else { + guard let undoManager = undoManager, let deleteCommand = DeleteCommand(nodesToDelete: nodesToDelete, undoManager: undoManager, errorHandler: ErrorHandler.present) else { return } diff --git a/Shared/Commands/DeleteCommand.swift b/Shared/Commands/DeleteCommand.swift index edc586fe5..1b37ff7aa 100644 --- a/Shared/Commands/DeleteCommand.swift +++ b/Shared/Commands/DeleteCommand.swift @@ -14,7 +14,6 @@ import Articles final class DeleteCommand: UndoableCommand { - let treeController: TreeController let undoManager: UndoManager let undoActionName: String var redoActionName: String { @@ -24,7 +23,7 @@ final class DeleteCommand: UndoableCommand { private let itemSpecifiers: [SidebarItemSpecifier] - init?(nodesToDelete: [Node], treeController: TreeController, undoManager: UndoManager, errorHandler: @escaping (Error) -> ()) { + init?(nodesToDelete: [Node], undoManager: UndoManager, errorHandler: @escaping (Error) -> ()) { guard DeleteCommand.canDelete(nodesToDelete) else { return nil @@ -33,7 +32,6 @@ final class DeleteCommand: UndoableCommand { return nil } - self.treeController = treeController self.undoActionName = actionName self.undoManager = undoManager self.errorHandler = errorHandler diff --git a/iOS/MasterFeed/MasterFeedViewController.swift b/iOS/MasterFeed/MasterFeedViewController.swift index dced3ac0c..a7eaa4146 100644 --- a/iOS/MasterFeed/MasterFeedViewController.swift +++ b/iOS/MasterFeed/MasterFeedViewController.swift @@ -811,7 +811,7 @@ private extension MasterFeedViewController { func delete(indexPath: IndexPath) { guard let undoManager = undoManager, let deleteNode = coordinator.nodeFor(indexPath), - let deleteCommand = DeleteCommand(nodesToDelete: [deleteNode], treeController: coordinator.treeController, undoManager: undoManager, errorHandler: ErrorHandler.present(self)) + let deleteCommand = DeleteCommand(nodesToDelete: [deleteNode], undoManager: undoManager, errorHandler: ErrorHandler.present(self)) else { return } diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift index 1e0f9c492..df33b27a5 100644 --- a/iOS/SceneCoordinator.swift +++ b/iOS/SceneCoordinator.swift @@ -69,7 +69,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider { } private let treeControllerDelegate = FeedTreeControllerDelegate() - private(set) lazy var treeController: TreeController = { + private lazy var treeController: TreeController = { return TreeController(delegate: treeControllerDelegate) }()