FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove TreeController from Delete command as it is no longer used there

Browse Source
This commit is contained in:
Maurice Parker 2019-09-01 14:56:27 -05:00
parent dfc3046bf0
commit 1a9acdcc50
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mac/MainWindow/Sidebar/SidebarViewController.swift
View File

@ -281,7 +281,7 @@ protocol SidebarDelegate: class {
func deleteNodes(_ nodes: [Node]) { func deleteNodes(_ nodes: [Node]) {
let nodesToDelete = treeController.normalizedSelectedNodes(nodes) 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 return
} }

4
Shared/Commands/DeleteCommand.swift
View File

@ -14,7 +14,6 @@ import Articles
final class DeleteCommand: UndoableCommand { final class DeleteCommand: UndoableCommand {
let treeController: TreeController
let undoManager: UndoManager let undoManager: UndoManager
let undoActionName: String let undoActionName: String
var redoActionName: String { var redoActionName: String {
@ -24,7 +23,7 @@ final class DeleteCommand: UndoableCommand {
private let itemSpecifiers: [SidebarItemSpecifier] 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 { guard DeleteCommand.canDelete(nodesToDelete) else {
return nil return nil
@ -33,7 +32,6 @@ final class DeleteCommand: UndoableCommand {
return nil return nil
} }
self.treeController = treeController
self.undoActionName = actionName self.undoActionName = actionName
self.undoManager = undoManager self.undoManager = undoManager
self.errorHandler = errorHandler self.errorHandler = errorHandler

2
iOS/MasterFeed/MasterFeedViewController.swift
View File

@ -811,7 +811,7 @@ private extension MasterFeedViewController {
func delete(indexPath: IndexPath) { func delete(indexPath: IndexPath) {
guard let undoManager = undoManager, guard let undoManager = undoManager,
let deleteNode = coordinator.nodeFor(indexPath), 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 { else {
return return
} }

2
iOS/SceneCoordinator.swift
View File

@ -69,7 +69,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
} }
private let treeControllerDelegate = FeedTreeControllerDelegate() private let treeControllerDelegate = FeedTreeControllerDelegate()
private(set) lazy var treeController: TreeController = { private lazy var treeController: TreeController = {
return TreeController(delegate: treeControllerDelegate) return TreeController(delegate: treeControllerDelegate)
}() }()