FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Deal with non-optional Node.childNodes.

This commit is contained in:
Brent Simmons 2018-02-25 22:02:16 -08:00
parent 49059fe78e
commit fc38a485d6
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Evergreen/FeedList/FeedListViewController.swift
View File

@ -91,7 +91,7 @@ extension FeedListViewController: NSOutlineViewDataSource {
func outlineView(_ outlineView: NSOutlineView, child index: Int, ofItem item: Any?) -> Any { func outlineView(_ outlineView: NSOutlineView, child index: Int, ofItem item: Any?) -> Any {
return nodeForItem(item as AnyObject?).childNodes![index] return nodeForItem(item as AnyObject?).childNodes[index]
} }
func outlineView(_ outlineView: NSOutlineView, isItemExpandable item: Any) -> Bool { func outlineView(_ outlineView: NSOutlineView, isItemExpandable item: Any) -> Bool {

5
Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift
View File

@ -147,9 +147,8 @@ private extension AddFeedWindowController {
menuItem.representedObject = folderTreeController.rootNode.representedObject menuItem.representedObject = folderTreeController.rootNode.representedObject
menu.addItem(menuItem) menu.addItem(menuItem)
if let childNodes = folderTreeController.rootNode.childNodes { let childNodes = folderTreeController.rootNode.childNodes
addFolderItemsToMenuWithNodes(menu: menu, nodes: childNodes, indentationLevel: 1) addFolderItemsToMenuWithNodes(menu: menu, nodes: childNodes, indentationLevel: 1)
}
return menu return menu
} }
@ -166,7 +165,7 @@ private extension AddFeedWindowController {
menu.addItem(menuItem) menu.addItem(menuItem)
if oneNode.numberOfChildNodes > 0 { if oneNode.numberOfChildNodes > 0 {
addFolderItemsToMenuWithNodes(menu: menu, nodes: oneNode.childNodes!, indentationLevel: indentationLevel + 1) addFolderItemsToMenuWithNodes(menu: menu, nodes: oneNode.childNodes, indentationLevel: indentationLevel + 1)
} }
} }
} }

2
Evergreen/MainWindow/Sidebar/SidebarOutlineDataSource.swift
View File

@ -28,7 +28,7 @@ import RSCore
func outlineView(_ outlineView: NSOutlineView, child index: Int, ofItem item: Any?) -> Any { func outlineView(_ outlineView: NSOutlineView, child index: Int, ofItem item: Any?) -> Any {
return nodeForItem(item as AnyObject?).childNodes![index] return nodeForItem(item as AnyObject?).childNodes[index]
} }
func outlineView(_ outlineView: NSOutlineView, isItemExpandable item: Any) -> Bool { func outlineView(_ outlineView: NSOutlineView, isItemExpandable item: Any) -> Bool {