Merge pull request #1148 from benjchristensen/merge-delay

Manual Merge of Delay PR

Author: benjchristensen

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

@@ -3367,7 +3367,7 @@ public final Observable<T> defaultIfEmpty(T defaultValue) {
     public final <U, V> Observable<T> delay(
             Func0<? extends Observable<U>> subscriptionDelay,
             Func1<? super T, ? extends Observable<V>> itemDelay) {
-        return create(OperationDelay.delay(this, subscriptionDelay, itemDelay));
+        return create(new OperatorDelayWithSelector<T, U, V>(this, subscriptionDelay, itemDelay));
     }
 
     /**
@@ -3389,7 +3389,7 @@ public final <U, V> Observable<T> delay(
      *         per-item basis
      */
     public final <U> Observable<T> delay(Func1<? super T, ? extends Observable<U>> itemDelay) {
-        return create(OperationDelay.delay(this, itemDelay));
+        return create(new OperatorDelayWithSelector<T, U, U>(this, itemDelay));
     }
 
     /**
@@ -3407,7 +3407,7 @@ public final <U> Observable<T> delay(Func1<? super T, ? extends Observable<U>> i
      * @see <a href="http://msdn.microsoft.com/en-us/library/hh229810.aspx">MSDN: Observable.Delay</a>
      */
     public final Observable<T> delay(long delay, TimeUnit unit) {
-        return OperationDelay.delay(this, delay, unit, Schedulers.computation());
+        return create(new OperatorDelay<T>(this, delay, unit, Schedulers.computation()));
     }
 
     /**
@@ -3427,7 +3427,7 @@ public final Observable<T> delay(long delay, TimeUnit unit) {
      * @see <a href="http://msdn.microsoft.com/en-us/library/hh229280.aspx">MSDN: Observable.Delay</a>
      */
     public final Observable<T> delay(long delay, TimeUnit unit, Scheduler scheduler) {
-        return OperationDelay.delay(this, delay, unit, scheduler);
+        return create(new OperatorDelay<T>(this, delay, unit, scheduler));
     }
 
     /**
@@ -3461,7 +3461,7 @@ public final Observable<T> delaySubscription(long delay, TimeUnit unit) {
      *         amount, waiting and subscribing on the given Scheduler
      */
     public final Observable<T> delaySubscription(long delay, TimeUnit unit, Scheduler scheduler) {
-        return create(OperationDelay.delaySubscription(this, delay, unit, scheduler));
+        return create(new OperatorDelaySubscription<T>(this, delay, unit, scheduler));
     }
 
     /**