Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

2.x: marble additions and updates (12/11) #5759

Merged
merged 1 commit into from
Dec 12, 2017
Merged

2.x: marble additions and updates (12/11) #5759

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions src/main/java/io/reactivex/Observable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7300,7 +7300,7 @@ public final Observable<T> doOnSubscribe(Consumer<? super Disposable> onSubscrib
* Modifies the source ObservableSource so that it invokes an action when it calls {@code onComplete} or
* {@code onError}.
* <p>
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnTerminate.png" alt="">
* <img width="640" height="327" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnTerminate.o.png" alt="">
* <p>
* This differs from {@code doAfterTerminate} in that this happens <em>before</em> the {@code onComplete} or
* {@code onError} notification.
Expand Down Expand Up @@ -7328,7 +7328,7 @@ public final Observable<T> doOnTerminate(final Action onTerminate) {
* Returns a Maybe that emits the single item at a specified index in a sequence of emissions from
* this Observable or completes if this Observable signals fewer elements than index.
* <p>
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/elementAt.2m.png" alt="">
* <img width="640" height="363" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/elementAt.o.png" alt="">
* <dl>
* <dt><b>Scheduler:</b></dt>
* <dd>{@code elementAt} does not operate by default on a particular {@link Scheduler}.</dd>
Expand All @@ -7355,7 +7355,7 @@ public final Maybe<T> elementAt(long index) {
* Returns a Single that emits the item found at a specified index in a sequence of emissions from
* this Observable, or a default item if that index is out of range.
* <p>
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/elementAt.2s.png" alt="">
* <img width="640" height="353" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/elementAtDefault.o.png" alt="">
* <dl>
* <dt><b>Scheduler:</b></dt>
* <dd>{@code elementAt} does not operate by default on a particular {@link Scheduler}.</dd>
Expand Down Expand Up @@ -7385,7 +7385,7 @@ public final Single<T> elementAt(long index, T defaultItem) {
* Returns a Single that emits the item found at a specified index in a sequence of emissions from this Observable
* or signals a {@link NoSuchElementException} if this Observable signals fewer elements than index.
* <p>
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/elementAt.2s.png" alt="">
* <img width="640" height="362" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/elementAtOrError.o.png" alt="">
* <dl>
* <dt><b>Scheduler:</b></dt>
* <dd>{@code elementAtOrError} does not operate by default on a particular {@link Scheduler}.</dd>
Expand Down Expand Up @@ -7435,7 +7435,7 @@ public final Observable<T> filter(Predicate<? super T> predicate) {
* Returns a Maybe that emits only the very first item emitted by the source ObservableSource, or
* completes if the source ObservableSource is empty.
* <p>
* <img width="640" height="237" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/firstElement.m.png" alt="">
* <img width="640" height="286" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/firstElement.m.png" alt="">
* <dl>
* <dt><b>Scheduler:</b></dt>
* <dd>{@code firstElement} does not operate by default on a particular {@link Scheduler}.</dd>
Expand Down Expand Up @@ -7475,7 +7475,7 @@ public final Single<T> first(T defaultItem) {
* Returns a Single that emits only the very first item emitted by this Observable or
* signals a {@link NoSuchElementException} if this Observable is empty.
* <p>
* <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/first.2.png" alt="">
* <img width="640" height="434" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/firstOrError.o.png" alt="">
* <dl>
* <dt><b>Scheduler:</b></dt>
* <dd>{@code firstOrError} does not operate by default on a particular {@link Scheduler}.</dd>
Expand Down Expand Up @@ -7521,7 +7521,7 @@ public final <R> Observable<R> flatMap(Function<? super T, ? extends ObservableS
* by the source ObservableSource, where that function returns an ObservableSource, and then merging those resulting
* ObservableSources and emitting the results of this merger.
* <p>
* <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMap.png" alt="">
* <img width="640" height="356" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapDelayError.o.png" alt="">
* <dl>
* <dt><b>Scheduler:</b></dt>
* <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
Expand Down Expand Up @@ -7550,8 +7550,8 @@ public final <R> Observable<R> flatMap(Function<? super T, ? extends ObservableS
* by the source ObservableSource, where that function returns an ObservableSource, and then merging those resulting
* ObservableSources and emitting the results of this merger, while limiting the maximum number of concurrent
* subscriptions to these ObservableSources.
* <!-- <p> -->
* <!-- <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMap.png" alt=""> -->
* <p>
* <img width="640" height="441" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapMaxConcurrency.o.png" alt="">
* <dl>
* <dt><b>Scheduler:</b></dt>
* <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
Expand Down Expand Up @@ -7583,8 +7583,8 @@ public final <R> Observable<R> flatMap(Function<? super T, ? extends ObservableS
* by the source ObservableSource, where that function returns an ObservableSource, and then merging those resulting
* ObservableSources and emitting the results of this merger, while limiting the maximum number of concurrent
* subscriptions to these ObservableSources.
* <!-- <p> -->
* <!-- <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMap.png" alt=""> -->
* <p>
* <img width="640" height="441" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapMaxConcurrency.o.png" alt="">
* <dl>
* <dt><b>Scheduler:</b></dt>
* <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
Expand Down Expand Up @@ -7707,8 +7707,8 @@ public final <R> Observable<R> flatMap(
* by the source ObservableSource, where that function returns an ObservableSource, and then merging those resulting
* ObservableSources and emitting the results of this merger, while limiting the maximum number of concurrent
* subscriptions to these ObservableSources.
* <!-- <p> -->
* <!-- <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMap.png" alt=""> -->
* <p>
* <img width="640" height="441" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapMaxConcurrency.o.png" alt="">
* <dl>
* <dt><b>Scheduler:</b></dt>
* <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
Expand Down