From 0ce18fe11ad123f0c553408b5b5bdb4e78742c4c Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Sun, 17 Sep 2017 12:22:15 -0700
Subject: [PATCH] Replace references to DataModel with Data.

---
 Evergreen/AppDelegate.swift                                     | 2 +-
 Evergreen/Data/DefaultFeedsImporter.swift                       | 2 +-
 Evergreen/Extensions/Node-Extensions.swift                      | 2 +-
 Evergreen/MainWindow/AddFeed/AddFeedController.swift            | 2 +-
 Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift      | 2 +-
 Evergreen/MainWindow/AddFeed/FolderTreeControllerDelegate.swift | 2 +-
 Evergreen/MainWindow/AddFolder/AddFolderWindowController.swift  | 2 +-
 Evergreen/MainWindow/Detail/ArticleRenderer.swift               | 2 +-
 Evergreen/MainWindow/Detail/DetailViewController.swift          | 2 +-
 Evergreen/MainWindow/MainWindowController.swift                 | 2 +-
 .../MainWindow/Sidebar/SidebarTreeControllerDelegate.swift      | 2 +-
 Evergreen/MainWindow/Sidebar/SidebarViewController.swift        | 2 +-
 Evergreen/MainWindow/StatusBar/StatusBarView.swift              | 2 +-
 Evergreen/MainWindow/Timeline/Cell/TimelineCellData.swift       | 2 +-
 .../MainWindow/Timeline/Cell/TimelineStringUtilities.swift      | 2 +-
 Evergreen/MainWindow/Timeline/TimelineViewController.swift      | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Evergreen/AppDelegate.swift b/Evergreen/AppDelegate.swift
index 851201be8..4720c59ef 100644
--- a/Evergreen/AppDelegate.swift
+++ b/Evergreen/AppDelegate.swift
@@ -8,7 +8,7 @@
 
 import Cocoa
 import DB5
-import DataModel
+import Data
 import RSTextDrawing
 import RSTree
 import RSParser
diff --git a/Evergreen/Data/DefaultFeedsImporter.swift b/Evergreen/Data/DefaultFeedsImporter.swift
index 4e53c0aac..8b6ee9b61 100644
--- a/Evergreen/Data/DefaultFeedsImporter.swift
+++ b/Evergreen/Data/DefaultFeedsImporter.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import DataModel
+import Data
 import LocalAccount
 
 private func shouldImportDefaultFeeds(_ isFirstRun: Bool) -> Bool {
diff --git a/Evergreen/Extensions/Node-Extensions.swift b/Evergreen/Extensions/Node-Extensions.swift
index a148084d2..03ffa5fcc 100644
--- a/Evergreen/Extensions/Node-Extensions.swift
+++ b/Evergreen/Extensions/Node-Extensions.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import RSTree
-import DataModel
+import Data
 
 extension Node {
 	
diff --git a/Evergreen/MainWindow/AddFeed/AddFeedController.swift b/Evergreen/MainWindow/AddFeed/AddFeedController.swift
index 07a77c2b4..843f729c6 100644
--- a/Evergreen/MainWindow/AddFeed/AddFeedController.swift
+++ b/Evergreen/MainWindow/AddFeed/AddFeedController.swift
@@ -9,7 +9,7 @@
 import Cocoa
 import RSCore
 import RSTree
-import DataModel
+import Data
 import RSFeedFinder
 
 // Run add-feed sheet.
diff --git a/Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift b/Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift
index 3bb5112d6..f4cc4a120 100644
--- a/Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift
+++ b/Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift
@@ -9,7 +9,7 @@
 import Cocoa
 import RSCore
 import RSTree
-import DataModel
+import Data
 
 protocol AddFeedWindowControllerDelegate: class {
 
diff --git a/Evergreen/MainWindow/AddFeed/FolderTreeControllerDelegate.swift b/Evergreen/MainWindow/AddFeed/FolderTreeControllerDelegate.swift
index e56c86d95..e083682c4 100644
--- a/Evergreen/MainWindow/AddFeed/FolderTreeControllerDelegate.swift
+++ b/Evergreen/MainWindow/AddFeed/FolderTreeControllerDelegate.swift
@@ -9,7 +9,7 @@
 import Foundation
 import RSCore
 import RSTree
-import DataModel
+import Data
 
 final class FolderTreeControllerDelegate: TreeControllerDelegate {
 	
diff --git a/Evergreen/MainWindow/AddFolder/AddFolderWindowController.swift b/Evergreen/MainWindow/AddFolder/AddFolderWindowController.swift
index d1eb3aee2..fd85227f4 100644
--- a/Evergreen/MainWindow/AddFolder/AddFolderWindowController.swift
+++ b/Evergreen/MainWindow/AddFolder/AddFolderWindowController.swift
@@ -7,7 +7,7 @@
 //
 
 import Cocoa
-import DataModel
+import Data
 
 //func addFolderWindowController() -> AddFolderWindowController {
 //	
diff --git a/Evergreen/MainWindow/Detail/ArticleRenderer.swift b/Evergreen/MainWindow/Detail/ArticleRenderer.swift
index 0cda6f53d..8281c1284 100644
--- a/Evergreen/MainWindow/Detail/ArticleRenderer.swift
+++ b/Evergreen/MainWindow/Detail/ArticleRenderer.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import RSCore
-import DataModel
+import Data
 
 var cachedStyleString = ""
 var cachedTemplate = ""
diff --git a/Evergreen/MainWindow/Detail/DetailViewController.swift b/Evergreen/MainWindow/Detail/DetailViewController.swift
index 03626cd99..112449bb0 100644
--- a/Evergreen/MainWindow/Detail/DetailViewController.swift
+++ b/Evergreen/MainWindow/Detail/DetailViewController.swift
@@ -9,7 +9,7 @@
 import Foundation
 import WebKit
 import RSCore
-import DataModel
+import Data
 
 class DetailViewController: NSViewController, WKNavigationDelegate, WKUIDelegate {
 	
diff --git a/Evergreen/MainWindow/MainWindowController.swift b/Evergreen/MainWindow/MainWindowController.swift
index 6e1e593bc..a74dfc3e1 100644
--- a/Evergreen/MainWindow/MainWindowController.swift
+++ b/Evergreen/MainWindow/MainWindowController.swift
@@ -7,7 +7,7 @@
 //
 
 import Cocoa
-import DataModel
+import Data
 
 private let kWindowFrameKey = "MainWindow"
 
diff --git a/Evergreen/MainWindow/Sidebar/SidebarTreeControllerDelegate.swift b/Evergreen/MainWindow/Sidebar/SidebarTreeControllerDelegate.swift
index 4373776da..aa6abd6e0 100644
--- a/Evergreen/MainWindow/Sidebar/SidebarTreeControllerDelegate.swift
+++ b/Evergreen/MainWindow/Sidebar/SidebarTreeControllerDelegate.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import RSTree
-import DataModel
+import Data
 
 final class SidebarTreeControllerDelegate: TreeControllerDelegate {
 
diff --git a/Evergreen/MainWindow/Sidebar/SidebarViewController.swift b/Evergreen/MainWindow/Sidebar/SidebarViewController.swift
index 35a6534a8..bf49f3844 100644
--- a/Evergreen/MainWindow/Sidebar/SidebarViewController.swift
+++ b/Evergreen/MainWindow/Sidebar/SidebarViewController.swift
@@ -8,7 +8,7 @@
 
 import Cocoa
 import RSTree
-import DataModel
+import Data
 
 @objc class SidebarViewController: NSViewController, NSOutlineViewDelegate, NSOutlineViewDataSource {
     
diff --git a/Evergreen/MainWindow/StatusBar/StatusBarView.swift b/Evergreen/MainWindow/StatusBar/StatusBarView.swift
index bebc78b3f..43b5e51af 100644
--- a/Evergreen/MainWindow/StatusBar/StatusBarView.swift
+++ b/Evergreen/MainWindow/StatusBar/StatusBarView.swift
@@ -8,7 +8,7 @@
 
 import Cocoa
 import RSCore
-import DataModel
+import Data
 import RSWeb
 
 final class StatusBarView: NSView {
diff --git a/Evergreen/MainWindow/Timeline/Cell/TimelineCellData.swift b/Evergreen/MainWindow/Timeline/Cell/TimelineCellData.swift
index a5ab877fa..c247aa6bf 100644
--- a/Evergreen/MainWindow/Timeline/Cell/TimelineCellData.swift
+++ b/Evergreen/MainWindow/Timeline/Cell/TimelineCellData.swift
@@ -7,7 +7,7 @@
 //
 
 import Cocoa
-import DataModel
+import Data
 
 var attributedTitleCache = [String: NSAttributedString]()
 var attributedDateCache = [String: NSAttributedString]()
diff --git a/Evergreen/MainWindow/Timeline/Cell/TimelineStringUtilities.swift b/Evergreen/MainWindow/Timeline/Cell/TimelineStringUtilities.swift
index c684bc1ef..87399b5b8 100644
--- a/Evergreen/MainWindow/Timeline/Cell/TimelineStringUtilities.swift
+++ b/Evergreen/MainWindow/Timeline/Cell/TimelineStringUtilities.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import DataModel
+import Data
 
 private let truncatedFeedNameCache = NSMutableDictionary()
 private let truncatedTitleCache = NSMutableDictionary()
diff --git a/Evergreen/MainWindow/Timeline/TimelineViewController.swift b/Evergreen/MainWindow/Timeline/TimelineViewController.swift
index 2e0bdee20..e7c5389fb 100644
--- a/Evergreen/MainWindow/Timeline/TimelineViewController.swift
+++ b/Evergreen/MainWindow/Timeline/TimelineViewController.swift
@@ -10,7 +10,7 @@ import Foundation
 import RSCore
 import RSTextDrawing
 import RSTree
-import DataModel
+import Data
 import LocalAccount
 
 let timelineFontSizeKVOKey = "values." + TimelineFontSizeKey