Fixed bugs surfaced by Scala-IDE 4.0

Author: Dean Wampler

src/main/java/progscala2/javainterop/ScalaTuples.java

@@ -4,7 +4,7 @@
 
 public class ScalaTuples {
   public static void main(String[] args) {
-    Tuple2 stringInteger = new Tuple2<String,Integer>("one", 2);
+    Tuple2<String,Integer> stringInteger = new Tuple2<String,Integer>("one", 2);
 
     System.out.println(stringInteger);
   }

src/main/scala/progscala2/fp/categories/functor.scala

@@ -17,7 +17,7 @@ object OptionF extends Functor[Option] {
 object FunctionF {                                                   // <4>
   def map[A,A2,B](func: A => A2)(f: A2 => B): A => B = {             // <5>
     val functor = new Functor[({type λ[β] = A => β})#λ] {            // <6>
-      def map[A3,B](func: A => A3)(f: A3 => B): A => B = (a: A) => f(func(a))
+      def map[A3,B2](func: A => A3)(f: A3 => B2): A => B2 = (a: A) => f(func(a))
     }
     functor.map(func)(f)                                             // <7>
   }

src/test/java/progscala2/javainterop/SMapTest.java

@@ -1,12 +1,20 @@
 // src/test/java/progscala2/javainterop/SMapTest.java
-import org.junit.*;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import static org.junit.Assert.*;
-import scala.*;
+package progscala2.javainterop;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import scala.Option;
 import scala.collection.mutable.LinkedHashMap;
 
 public class SMapTest extends org.scalatest.junit.JUnitSuite {       // <1>
+  
+	// Apparently JUnitSuite is serializable, so we need this:
+	private static final long serialVersionUID = 693445694552874517L;
+
   static class Name {
     public String firstName;
     public String lastName;