Skip to content

Commit e6832d2

Browse files
committed
adding @SInCE annotations, a few other touch-ups to javadocs of new operators
1 parent 0356d4f commit e6832d2

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5636,6 +5636,7 @@ public final Observable<T> repeat(final long count, Scheduler scheduler) {
56365636
* @return the source Observable modified with repeat logic
56375637
* @see <a href="https://github.com/Netflix/RxJava/wiki/Creating-Observables#wiki-repeat">RxJava Wiki: repeatWhen()</a>
56385638
* @see <a href="http://msdn.microsoft.com/en-us/library/hh229428.aspx">MSDN: Observable.Repeat</a>
5639+
* @since 0.20
56395640
*/
56405641
public final Observable<T> repeatWhen(Func1<? super Observable<? extends Notification<?>>, ? extends Observable<? extends Notification<?>>> notificationHandler, Scheduler scheduler) {
56415642
return OnSubscribeRedo.repeat(this, notificationHandler, scheduler);
@@ -5648,12 +5649,15 @@ public final Observable<T> repeatWhen(Func1<? super Observable<? extends Notific
56485649
* or {@code onError} on the child subscription. Otherwise, this observable will resubscribe to the source observable.
56495650
* <p>
56505651
* <img width="640" height="430" src="https://raw.github.com/wiki/Netflix/RxJava/images/rx-operators/repeatWhen.f.png" alt="">
5652+
* <p>
5653+
* {@code repeatWhen} operates by default on the {@code trampoline} {@link Scheduler}.
56515654
*
56525655
* @param notificationHandler
56535656
* recieves an Observable of notifications with which a user can complete or error, aborting the repeat.
56545657
* @return the source Observable modified with repeat logic
56555658
* @see <a href="https://github.com/Netflix/RxJava/wiki/Creating-Observables#wiki-repeat">RxJava Wiki: repeatWhen()</a>
56565659
* @see <a href="http://msdn.microsoft.com/en-us/library/hh229428.aspx">MSDN: Observable.Repeat</a>
5660+
* @since 0.20
56575661
*/
56585662
public final Observable<T> repeatWhen(Func1<? super Observable<? extends Notification<?>>, ? extends Observable<? extends Notification<?>>> notificationHandler) {
56595663
return OnSubscribeRedo.repeat(this, notificationHandler);
@@ -6301,6 +6305,7 @@ public final Observable<T> retry(Func2<Integer, Throwable, Boolean> predicate) {
63016305
* recieves an Observable of notifications with which a user can complete or error, aborting the retry.
63026306
* @return the source Observable modified with retry logic
63036307
* @see <a href="https://github.com/Netflix/RxJava/wiki/Error-Handling-Operators#wiki-retry">RxJava Wiki: retryWhen()</a>
6308+
* @since 0.20
63046309
*/
63056310
public final Observable<T> retryWhen(Func1<? super Observable<? extends Notification<?>>, ? extends Observable<?>> notificationHandler) {
63066311
return OnSubscribeRedo.<T> retry(this, notificationHandler);
@@ -6319,6 +6324,7 @@ public final Observable<T> retryWhen(Func1<? super Observable<? extends Notifica
63196324
* recieves an Observable of notifications with which a user can complete or error, aborting the retry.
63206325
* @return the source Observable modified with retry logic
63216326
* @see <a href="https://github.com/Netflix/RxJava/wiki/Error-Handling-Operators#wiki-retry">RxJava Wiki: retryWhen()</a>
6327+
* @since 0.20
63226328
*/
63236329
public final Observable<T> retryWhen(Func1<? super Observable<? extends Notification<?>>, ? extends Observable<? extends Notification<?>>> notificationHandler, Scheduler scheduler) {
63246330
return OnSubscribeRedo.<T> retry(this, notificationHandler, scheduler);
@@ -8971,7 +8977,7 @@ public final <T2, R> Observable<R> zip(Iterable<? extends T2> other, Func2<? sup
89718977
* and emits the results of {@code zipFunction} applied to these pairs
89728978
* @see <a href="https://github.com/Netflix/RxJava/wiki/Combining-Observables#zip">RxJava wiki: zip</a>
89738979
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.zip.aspx">MSDN: Observable.Zip</a>
8974-
* @deprecated Use zipWith instead. Changed to match naming convention of mergeWith, concatWith, etc
8980+
* @deprecated use {@code zipWith} instead. Changed to match naming convention of {@code mergeWith}, {@code concatWith}, etc.
89758981
*/
89768982
@Deprecated
89778983
public final <T2, R> Observable<R> zip(Observable<? extends T2> other, Func2<? super T, ? super T2, ? extends R> zipFunction) {
@@ -8999,6 +9005,7 @@ public final <T2, R> Observable<R> zip(Observable<? extends T2> other, Func2<? s
89999005
* and emits the results of {@code zipFunction} applied to these pairs
90009006
* @see <a href="https://github.com/Netflix/RxJava/wiki/Combining-Observables#zip">RxJava wiki: zip</a>
90019007
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.zip.aspx">MSDN: Observable.Zip</a>
9008+
* @since 0.20
90029009
*/
90039010
public final <T2, R> Observable<R> zipWith(Observable<? extends T2> other, Func2<? super T, ? super T2, ? extends R> zipFunction) {
90049011
return zip(this, other, zipFunction);

0 commit comments

Comments
 (0)