Skip to content

Commit e7a8e0b

Browse files
committed
javadoc enhancements for zip(iterable) => zipWith(iterable) switchover
1 parent 3f7ad8c commit e7a8e0b

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9924,7 +9924,7 @@ public final <U> Observable<Observable<T>> window(Observable<U> boundary) {
99249924
* sequence and emits the results of {@code zipFunction} applied to these pairs
99259925
* @see <a href="https://github.com/Netflix/RxJava/wiki/Combining-Observables#zip">RxJava wiki: zip</a>
99269926
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.zip.aspx">MSDN: Observable.Zip</a>
9927-
* @deprecated use zipWith
9927+
* @deprecated use {@link #zipWith}
99289928
*/
99299929
@Deprecated
99309930
public final <T2, R> Observable<R> zip(Iterable<? extends T2> other, Func2<? super T, ? super T2, ? extends R> zipFunction) {
@@ -9941,7 +9941,7 @@ public final <T2, R> Observable<R> zip(Iterable<? extends T2> other, Func2<? sup
99419941
* not pre-consumed. This allows you to zip infinite streams on either side.
99429942
* <dl>
99439943
* <dt><b>Scheduler:</b></dt>
9944-
* <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
9944+
* <dd>{@code zipWith} does not operate by default on a particular {@link Scheduler}.</dd>
99459945
* </dl>
99469946
*
99479947
* @param <T2>
@@ -9957,6 +9957,7 @@ public final <T2, R> Observable<R> zip(Iterable<? extends T2> other, Func2<? sup
99579957
* sequence and emits the results of {@code zipFunction} applied to these pairs
99589958
* @see <a href="https://github.com/Netflix/RxJava/wiki/Combining-Observables#zip">RxJava wiki: zip</a>
99599959
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.zip.aspx">MSDN: Observable.Zip</a>
9960+
* @since 0.20
99609961
*/
99619962
public final <T2, R> Observable<R> zipWith(Iterable<? extends T2> other, Func2<? super T, ? super T2, ? extends R> zipFunction) {
99629963
return lift(new OperatorZipIterable<T, T2, R>(other, zipFunction));

0 commit comments

Comments
 (0)