use Tuple instead of Timestamped

Author: samuelgruetter

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

@@ -22,7 +22,6 @@ import scala.concurrent.duration._
 import org.junit.{Before, Test, Ignore}
 import org.junit.Assert._
 import rx.lang.scala.concurrency.Schedulers
-import rx.lang.scala.util.Timestamped
 import java.io.IOException
 
 @Ignore // Since this doesn't do automatic testing, don't increase build time unnecessarily
@@ -379,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 ((millis, value) <- timestamped if value > 0) {
       println(value + " at t = " + millis)
     }
   }

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

@@ -246,14 +246,15 @@ class Observable[+T] private[scala] (val asJava: rx.Observable[_ <: T])
   }
 
   /**
-   * Wraps each item emitted by a source Observable in a [[rx.lang.scala.util.Timestamped]] object.
+   * Wraps each item emitted by a source Observable in a timestamped tuple.
    *
    * <img width="640" src="https://github.com/Netflix/RxJava/wiki/images/rx-operators/timestamp.png">
    * 
    * @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(_))
+  def timestamp: Observable[(Long, T)] = {
+    Observable[rx.util.Timestamped[_ <: T]](asJava.timestamp())
+      .map((t: rx.util.Timestamped[_ <: T]) => (t.getTimestampMillis, t.getValue()))
   }
 
   /**