Timestamped and its companion can now have the same name

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, TimestampedObject}
+import rx.lang.scala.util.Timestamped
 
 @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 (TimestampedObject(millis, value) <- timestamped if value > 0) {
+    for (Timestamped(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(TimestampedObject(_))
+    Observable[rx.util.Timestamped[_ <: T]](asJava.timestamp()).map(Timestamped(_))
   }
 
   /**

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

@@ -0,0 +1,30 @@
+package rx.lang.scala.util
+
+/**
+ * Wraps a value and a timestamp.
+ */
+class Timestamped[+T](val asJava: rx.util.Timestamped[_ <: T]) extends AnyVal {
+  /**
+   * Returns the timestamp, in milliseconds.
+   */
+  def millis: Long = asJava.getTimestampMillis
+  
+  /**
+   * Returns the value.
+   */
+  def value: T = asJava.getValue : T
+}
+
+object Timestamped {
+  def apply[T](timestampMillis: Long, value: T): Timestamped[T] = {
+    new Timestamped(new rx.util.Timestamped(timestampMillis, value))
+  }
+
+  def apply[T](asJava: rx.util.Timestamped[_ <: T]): Timestamped[T] = {
+    new Timestamped(asJava)
+  }
+
+  def unapply[T](v: Timestamped[T]): Option[(Long, T)] = {
+    Some((v.millis, v.value))
+  }
+}

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

@@ -42,24 +42,5 @@ package object util {
   def Closing() = rx.util.Closings.create()
 
   // rx.util.Range not needed because there's a standard Scala Range
-
-  class Timestamped[+T](val asJava: rx.util.Timestamped[_ <: T]) {}
-  
-  // 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))
-    }
-    
-    def apply[T](asJava: rx.util.Timestamped[_ <: T]): Timestamped[T] = {
-      new Timestamped(asJava)
-    }
-    
-    def unapply[T](v: Timestamped[T]): Option[(Long, T)] = unapply(v.asJava)
-    
-    def unapply[T](v: rx.util.Timestamped[_ <: T]): Option[(Long, T)] = {
-      Some((v.getTimestampMillis, v.getValue))
-    }
-  }
 
 }