separate the FillableCell protocol requirements from the BaseCell pro…

…tocol
AliSoftware · Oct 10, 2015 · 3bca744 · 3bca744
1 parent c311eea
commit 3bca744
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/Example/DipSampleApp/Cells/BaseCell.swift b/Example/DipSampleApp/Cells/BaseCell.swift
@@ -9,15 +9,11 @@
 import UIKit
 
 protocol BaseCell {
-    typealias ObjectType
-
     static var identifier: String { get }
     static var nib: UINib? { get }
 
     static func register(tableView: UITableView)
     static func dequeueFromTableView(tableView: UITableView, forIndexPath indexPath: NSIndexPath) -> Self
-
-    func fillWithObject(object: ObjectType)
 }
 
 extension BaseCell where Self : UITableViewCell {
@@ -37,4 +33,9 @@ extension BaseCell where Self : UITableViewCell {
     static func dequeueFromTableView(tableView: UITableView, forIndexPath indexPath: NSIndexPath) -> Self {
         return tableView.dequeueReusableCellWithIdentifier(identifier, forIndexPath: indexPath) as! Self
     }
-}
+}
+
+protocol FillableCell: BaseCell {
+    typealias ObjectType
+    func fillWithObject(object: ObjectType)
+}
diff --git a/Example/DipSampleApp/Cells/PersonCell.swift b/Example/DipSampleApp/Cells/PersonCell.swift
@@ -8,9 +8,7 @@
 
 import UIKit
 
-final class PersonCell : UITableViewCell, BaseCell {
-    typealias ObjectType = Person
-
+final class PersonCell : UITableViewCell, FillableCell {
     @IBOutlet weak var nameLabel: UILabel!
     @IBOutlet weak var genderImageView: UIImageView!
     @IBOutlet weak var heightLabel: UILabel!

diff --git a/Example/DipSampleApp/Cells/StarshipCell.swift b/Example/DipSampleApp/Cells/StarshipCell.swift
@@ -8,9 +8,7 @@
 
 import UIKit
 
-final class StarshipCell : UITableViewCell, BaseCell {
-    typealias ObjectType = Starship
-
+final class StarshipCell : UITableViewCell, FillableCell {
     @IBOutlet weak var nameLabel: UILabel!
     @IBOutlet weak var modelLabel: UILabel!
     @IBOutlet weak var manufacturerLabel: UILabel!

diff --git a/Example/DipSampleApp/ViewControllers/FetchableTrait.swift b/Example/DipSampleApp/ViewControllers/FetchableTrait.swift
@@ -34,7 +34,7 @@ extension FetchableTrait {
                 } else {
                     self.objects = [object]
                 }
-                self.tableView.reloadData()
+                self.tableView?.reloadData()
             }
         }
     }
@@ -46,7 +46,7 @@ extension FetchableTrait {
         fetchAll() { objects in
             guard batch == self.batchRequestID else { return }
             self.objects = objects
-            self.tableView.reloadData()
+            self.tableView?.reloadData()
         }
     }
 }