put unapply of Notifications into companions

no more scalac crash

Author: samuelgruetter

language-adaptors/rxjava-scala/src/examples/scala/rx/lang/scala/examples/RxScalaDemo.scala

@@ -23,8 +23,9 @@ import org.junit.{Before, Test, Ignore}
 import org.junit.Assert._
 import rx.lang.scala.concurrency.NewThreadScheduler
 import rx.lang.scala.util.Timestamped
+import java.io.IOException
 
-//@Ignore // Since this doesn't do automatic testing, don't increase build time unnecessarily
+@Ignore // Since this doesn't do automatic testing, don't increase build time unnecessarily
 class RxScalaDemo extends JUnitSuite {
 
   @Test def intervalExample() {
@@ -385,13 +386,17 @@ class RxScalaDemo extends JUnitSuite {
 
   @Test def materializeExample() {
     def printObservable[T](o: Observable[T]): Unit = {
+      import Notification._
       for (n <- o.materialize.toBlockingObservable) n match {
-        case Notification.OnNext[T](v) => println("Got value " + v)
-        case Notification.OnCompleted[T]() => println("Completed")
-        case Notification.OnError[T](err) => println("Error: ")
-      } 
+        case OnNext(v) => println("Got value " + v)
+        case OnCompleted() => println("Completed")
+        case OnError(err) => println("Error: " + err.getMessage)
+      }
     }
-    val mat = Observable.interval(100 millis).take(3).materialize
+    val o1 = Observable.interval(100 millis).take(3)
+    val o2 = o1 ++ Observable(new IOException("Oops"))
+    printObservable(o1)
+    printObservable(o2)
   }
 
   def output(s: String): Unit = println(s)

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/Notification.scala

@@ -17,6 +17,9 @@ object Notification {
 
   class OnNext[+T](val asJava: rx.Notification[_ <: T]) extends Notification[T] {
     def value: T = asJava.getValue
+  }
+  
+  object OnNext {
     def unapply[U](n: Notification[U]): Option[U] = n match {
       case n2: OnNext[U] => Some(n.asJava.getValue)
       case _ => None
@@ -25,13 +28,18 @@ object Notification {
 
   class OnError[+T](val asJava: rx.Notification[_ <: T]) extends Notification[T] {
     def error: Throwable = asJava.getThrowable()
+  }
+  
+  object OnError {
     def unapply[U](n: Notification[U]): Option[Throwable] = n match {
       case n2: OnError[U] => Some(n2.asJava.getThrowable)
       case _ => None
     }
   }
 
-  class OnCompleted[T](val asJava: rx.Notification[_ <: T]) extends Notification[T] {
+  class OnCompleted[T](val asJava: rx.Notification[_ <: T]) extends Notification[T] {}
+  
+  object OnCompleted {
     def unapply[U](n: Notification[U]): Option[Unit] = n match {
       case n2: OnCompleted[U] => Some()
       case _ => None