work around scalac bug by renaming companion object Timestamped to TimestampedObject

Author: samuelgruetter

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

@@ -22,7 +22,7 @@ import scala.concurrent.duration._
 import org.junit.{Before, Test, Ignore}
 import org.junit.Assert._
 import rx.lang.scala.concurrency.NewThreadScheduler
-import rx.lang.scala.util.Timestamped
+import rx.lang.scala.util.{Timestamped, TimestampedObject}
 
 @Ignore // Since this doesn't do automatic testing, don't increase build time unnecessarily
 class RxScalaDemo extends JUnitSuite {
@@ -378,7 +378,7 @@ class RxScalaDemo extends JUnitSuite {
 
   @Test def timestampExample() {
     val timestamped = Observable.interval(100 millis).take(3).timestamp.toBlockingObservable
-    for (Timestamped(millis, value) <- timestamped if value > 0) {
+    for (TimestampedObject(millis, value) <- timestamped if value > 0) {
       println(value + " at t = " + millis)
     }
   }

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

@@ -199,7 +199,7 @@ class Observable[+T](val asJava: rx.Observable[_ <: T])
    * @return an Observable that emits timestamped items from the source Observable
    */
   def timestamp: Observable[Timestamped[T]] = {
-    Observable[rx.util.Timestamped[_ <: T]](asJava.timestamp()).map(Timestamped(_))
+    Observable[rx.util.Timestamped[_ <: T]](asJava.timestamp()).map(TimestampedObject(_))
   }
 
   /**

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/util/package.scala

@@ -45,7 +45,8 @@ package object util {
 
   class Timestamped[+T](val asJava: rx.util.Timestamped[_ <: T]) {}
 
-  object Timestamped {
+  // TODO rename this to Timestamped without making scalac crash
+  object TimestampedObject {
     def apply[T](timestampMillis: Long, value: T): Timestamped[T] = {
       new Timestamped(new rx.util.Timestamped(timestampMillis, value))
     }