Skip to content

Commit b604a32

Browse files
Merge branch 'OperatorTakeTimed429' of github.com:akarnokd/RxJava into merge-prs
Conflicts: rxjava-core/src/main/java/rx/Observable.java
2 parents a100bc6 + 1383d3d commit b604a32

File tree

4 files changed

+88
-293
lines changed

4 files changed

+88
-293
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@
4949
import rx.operators.OnSubscribeFromIterable;
5050
import rx.operators.OnSubscribeRange;
5151
import rx.operators.OperationDelay;
52-
import rx.operators.OperationSkipUntil;
5352
import rx.operators.OperationTakeLast;
54-
import rx.operators.OperationTakeTimed;
5553
import rx.operators.OperationTakeUntil;
5654
import rx.operators.OperationWindow;
5755
import rx.operators.OperatorAll;
@@ -112,10 +110,12 @@
112110
import rx.operators.OperatorSkipLast;
113111
import rx.operators.OperatorSkipLastTimed;
114112
import rx.operators.OperatorSkipTimed;
113+
import rx.operators.OperatorSkipUntil;
115114
import rx.operators.OperatorSkipWhile;
116115
import rx.operators.OperatorSubscribeOn;
117116
import rx.operators.OperatorSwitch;
118117
import rx.operators.OperatorTake;
118+
import rx.operators.OperatorTakeTimed;
119119
import rx.operators.OperatorTakeWhile;
120120
import rx.operators.OperatorThrottleFirst;
121121
import rx.operators.OperatorTimeInterval;
@@ -6441,7 +6441,7 @@ public final Observable<T> take(long time, TimeUnit unit) {
64416441
* @see <a href="https://github.com/Netflix/RxJava/wiki/Filtering-Observables#wiki-take">RxJava Wiki: take()</a>
64426442
*/
64436443
public final Observable<T> take(long time, TimeUnit unit, Scheduler scheduler) {
6444-
return create(new OperationTakeTimed.TakeTimed<T>(this, time, unit, scheduler));
6444+
return lift(new OperatorTakeTimed<T>(time, unit, scheduler));
64456445
}
64466446

64476447
/**

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

Lines changed: 0 additions & 289 deletions
This file was deleted.

0 commit comments

Comments
 (0)