Merging tweaks to examples.

Author: chicagoscala

build.sbt

@@ -24,7 +24,7 @@ libraryDependencies ++= Seq(
 )
 
 scalacOptions ++= Seq(
-  "-encoding", "UTF-8", "-optimise", 
+  "-encoding", "UTF-8", "-optimise",
   "-deprecation", "-unchecked", "-feature", "-Xlint", "-Ywarn-infer-any")
 
 javacOptions  ++= Seq(

misc/parthenon-payroll.txt

@@ -0,0 +1,7 @@
+# Input for the Parthenon Payroll example.h
+# See the "Application Design" Chapter and
+# src/main/scala/progscala2/appdesign/parthenon/payroll-use-cases.scala
+# Name, annual salary, fed tax, state tax, insurance premiums, retirement
+Joe CEO,    200000.0, 20.0, 5.0, 200.0,  5.0
+Jane CFO,   180000.0, 20.0, 5.0, 250.0,  7.0
+Phil Coder, 120000.0, 15.0, 5.0, 150.0, 10.0

src/main/scala/progscala2/concurrency/futures/future-callbacks.sc

@@ -9,8 +9,8 @@ case class ThatsOdd(i: Int) extends RuntimeException(                // <1>
 import scala.util.{Try, Success, Failure}                            // <2>
 
 val doComplete: PartialFunction[Try[String],Unit] = {                // <3>
-  case s @ Success(string) => println(s)                             // <4>
-  case f @ Failure(ex) => println(f)
+  case s @ Success(_) => println(s)                                  // <4>
+  case f @ Failure(_) => println(f)
 }
 
 val futures = (0 to 9) map {                                         // <5>

src/main/scala/progscala2/metaprogramming/match-types.sc

@@ -2,13 +2,13 @@
 
 import scala.reflect.ClassTag
 
-def doClassTagMatch[T : ClassTag](seq: Seq[T]): String = seq match { // <1>
+def useClassTag[T : ClassTag](seq: Seq[T]): String = seq match { // <1>
   case Nil => "Nothing"
   case head +: _ => implicitly(seq.head).getClass.toString           // <2>
 }
 
 def check(seq: Seq[_]): String =                                     // <3>
-  s"Seq: ${doClassTagMatch(seq)}"
+  s"Seq: ${useClassTag(seq)}"
 
 Seq(Seq(5.5,5.6,5.7), Seq("a", "b"),                                 // <4>
     Seq(1, "two", 3.14), Nil) foreach {