Merge branch 'time-interval' of git://github.com/zsxwing/RxJava into merge-prs

Conflicts:
	rxjava-core/src/main/java/rx/Observable.java

Author: benjchristensen

rxjava-core/src/main/java/rx/Observable.java

@@ -60,7 +60,6 @@
 import rx.operators.OperationTakeUntil;
 import rx.operators.OperationTakeWhile;
 import rx.operators.OperationThrottleFirst;
-import rx.operators.OperationTimeInterval;
 import rx.operators.OperationWindow;
 import rx.operators.OperatorAll;
 import rx.operators.OperatorAmb;
@@ -119,6 +118,7 @@
 import rx.operators.OperatorSkipWhile;
 import rx.operators.OperatorSubscribeOn;
 import rx.operators.OperatorTake;
+import rx.operators.OperatorTimeInterval;
 import rx.operators.OperatorTimeout;
 import rx.operators.OperatorTimeoutWithSelector;
 import rx.operators.OperatorTimerOnce;
@@ -6872,7 +6872,7 @@ public final Observable<T> throttleWithTimeout(long timeout, TimeUnit unit, Sche
      * @see <a href="http://msdn.microsoft.com/en-us/library/hh212107.aspx">MSDN: Observable.TimeInterval</a>
      */
     public final Observable<TimeInterval<T>> timeInterval() {
-        return create(OperationTimeInterval.timeInterval(this));
+        return lift(new OperatorTimeInterval(Schedulers.immediate()));
     }
 
     /**
@@ -6888,7 +6888,7 @@ public final Observable<TimeInterval<T>> timeInterval() {
      * @see <a href="http://msdn.microsoft.com/en-us/library/hh212107.aspx">MSDN: Observable.TimeInterval</a>
      */
     public final Observable<TimeInterval<T>> timeInterval(Scheduler scheduler) {
-        return create(OperationTimeInterval.timeInterval(this, scheduler));
+        return lift(new OperatorTimeInterval(scheduler));
     }
 
     /**

rxjava-core/src/main/java/rx/operators/OperationTimeInterval.java

@@ -0,0 +1,60 @@
+/**
+ * Copyright 2014 Netflix, Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package rx.operators;
+
+import rx.Observable.Operator;
+import rx.Scheduler;
+import rx.Subscriber;
+import rx.schedulers.TimeInterval;
+
+/**
+ * Records the time interval between consecutive elements in an observable sequence.
+ */
+public final class OperatorTimeInterval<T> implements Operator<TimeInterval<T>, T> {
+
+    private final Scheduler scheduler;
+
+    public OperatorTimeInterval(Scheduler scheduler) {
+        this.scheduler = scheduler;
+    }
+
+    @Override
+    public Subscriber<? super T> call(final Subscriber<? super TimeInterval<T>> subscriber) {
+        return new Subscriber<T>(subscriber) {
+
+            // The beginning time is the time when the observer subscribes.
+            private long lastTimestamp = scheduler.now();
+
+
+            @Override
+            public void onNext(T args) {
+                long nowTimestamp = scheduler.now();
+                subscriber.onNext(new TimeInterval<T>(nowTimestamp - lastTimestamp, args));
+                lastTimestamp = nowTimestamp;
+            }
+
+            @Override
+            public void onCompleted() {
+                subscriber.onCompleted();
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                subscriber.onError(e);
+            }
+        };
+    }
+}

rxjava-core/src/main/java/rx/operators/OperatorTimeInterval.java

@@ -32,7 +32,7 @@
 import rx.schedulers.TimeInterval;
 import rx.subjects.PublishSubject;
 
-public class OperationTimeIntervalTest {
+public class OperatorTimeIntervalTest {
 
     private static final TimeUnit TIME_UNIT = TimeUnit.MILLISECONDS;