Minor refactoring for compatibility with Swift 1.1 and 1.2

Fixes #21
- Avoid overriding any of the table view controller initializers
- Refactor and modernize the Model class

Author: Tyler Fox

TableViewCellWithAutoLayout/TableViewController/Model.swift

@@ -9,27 +9,27 @@ import Foundation
 
 class Model
 {
-    var dataArray: Array<(title:String, body:String)> = Array()
-        
-    func populate()
+    var dataArray: [(title: String, body: String)] = Array()
+    
+    init(populated: Bool)
     {
-        var fontFamilies = UIFont.familyNames()
-        
-        for familyName: AnyObject in fontFamilies {
-            if let familyNameString: String = familyName as? String {
-                dataArray.append((title: familyNameString, body: randomLoremIpsum()))
+        if (populated) {
+            for familyName: AnyObject in UIFont.familyNames() {
+                if let familyNameString = familyName as? String {
+                    dataArray.append((title: familyNameString, body: randomLoremIpsum()))
+                }
             }
         }
     }
 
     func addSingleItem()
     {
-        var fontFamilies = UIFont.familyNames()
+        let fontFamilies = UIFont.familyNames()
 
         let r = random() % fontFamilies.count
         let familyName: AnyObject = fontFamilies[r]
 
-        if let familyNameString: String = familyName as? String {
+        if let familyNameString = familyName as? String {
             dataArray.append((title: familyNameString, body: randomLoremIpsum()))
         }
     }
@@ -38,7 +38,7 @@ class Model
     {
         let loremIpsum = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent non quam ac massa viverra semper. Maecenas mattis justo ac augue volutpat congue. Maecenas laoreet, nulla eu faucibus gravida, felis orci dictum risus, sed sodales sem eros eget risus. Morbi imperdiet sed diam et sodales. Vestibulum ut est id mauris ultrices gravida. Nulla malesuada metus ut erat malesuada, vitae ornare neque semper. Aenean a commodo justo, vel placerat odio. Curabitur vitae consequat tortor. Aenean eu magna ante. Integer tristique elit ac augue laoreet, eget pulvinar lacus dictum. Cras eleifend lacus eget pharetra elementum. Etiam fermentum eu felis eu tristique. Integer eu purus vitae turpis blandit consectetur. Nulla facilisi. Praesent bibendum massa eu metus pulvinar, quis tristique nunc commodo. Ut varius aliquam elit, a tincidunt elit aliquam non. Nunc ac leo purus. Proin condimentum placerat ligula, at tristique neque scelerisque ut. Suspendisse ut congue enim. Integer id sem nisl. Nam dignissim, lectus et dictum sollicitudin, libero augue ullamcorper justo, nec consectetur dolor arcu sed justo. Proin rutrum pharetra lectus, vel gravida ante venenatis sed. Mauris lacinia urna vehicula felis aliquet venenatis. Suspendisse non pretium sapien. Proin id dolor ultricies, dictum augue non, euismod ante. Vivamus et luctus augue, a luctus mi. Maecenas sit amet felis in magna vestibulum viverra vel ut est. Suspendisse potenti. Morbi nec odio pretium lacus laoreet volutpat sit amet at ipsum. Etiam pretium purus vitae tortor auctor, quis cursus metus vehicula. Integer ultricies facilisis arcu, non congue orci pharetra quis. Vivamus pulvinar ligula neque, et vehicula ipsum euismod quis."
 
-        var loremIpsumArray = loremIpsum.componentsSeparatedByString(" ")
+        let loremIpsumArray = loremIpsum.componentsSeparatedByString(" ")
 
         let minimumNumberOfWords = 3
         let r = max(minimumNumberOfWords, random() % loremIpsumArray.count) // get a random number r, where:  minimumNumberOfWords <= r <= loremIpsumArray.count

TableViewCellWithAutoLayout/TableViewController/TableViewController.swift

@@ -11,21 +11,7 @@ class TableViewController: UITableViewController
 {
     let kCellIdentifier = "CellIdentifier"
 
-    var model = Model()
-    
-    override init(style: UITableViewStyle)
-    {
-        super.init(style: style)
-        
-        model.populate()
-    }
-    
-    required init(coder aDecoder: NSCoder)
-    {
-        super.init(coder: aDecoder)
-        
-        model.populate()
-    }
+    var model = Model(populated: true)
 
     override func viewDidLoad()
     {
@@ -87,7 +73,7 @@ class TableViewController: UITableViewController
             rowsToDelete.addObject(NSIndexPath(forRow: i, inSection: 0))
         }
 
-        model = Model()
+        model = Model(populated: false)
 
         tableView.deleteRowsAtIndexPaths(rowsToDelete as [AnyObject], withRowAnimation: .Automatic)
     }