Skip to content

Commit f76861b

Browse files
committed
Correcting javadocs for the amb/ambWith operators
1 parent ccada81 commit f76861b

File tree

1 file changed

+40
-30
lines changed

1 file changed

+40
-30
lines changed

src/main/java/rx/Observable.java

Lines changed: 40 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,8 @@ public static interface Transformer<T, R> extends Func1<Observable<T>, Observabl
205205
*/
206206

207207
/**
208-
* Mirrors the one Observable in an Iterable of several Observables that first emits an item.
208+
* Mirrors the one Observable in an Iterable of several Observables that first either emits an item or sends
209+
* a termination notification.
209210
* <p>
210211
* <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.png" alt="">
211212
* <dl>
@@ -215,16 +216,17 @@ public static interface Transformer<T, R> extends Func1<Observable<T>, Observabl
215216
*
216217
* @param sources
217218
* an Iterable of Observable sources competing to react first
218-
* @return an Observable that emits the same sequence of items as whichever of the source Observables first
219-
* emitted an item
219+
* @return an Observable that emits the same sequence as whichever of the source Observables first
220+
* emitted an item or sent a termination notification
220221
* @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
221222
*/
222223
public final static <T> Observable<T> amb(Iterable<? extends Observable<? extends T>> sources) {
223224
return create(OnSubscribeAmb.amb(sources));
224225
}
225226

226227
/**
227-
* Given two Observables, mirrors the one that first emits an item.
228+
* Given two Observables, mirrors the one that first either emits an item or sends a termination
229+
* notification.
228230
* <p>
229231
* <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.png" alt="">
230232
* <dl>
@@ -236,16 +238,17 @@ public final static <T> Observable<T> amb(Iterable<? extends Observable<? extend
236238
* an Observable competing to react first
237239
* @param o2
238240
* an Observable competing to react first
239-
* @return an Observable that emits the same sequence of items as whichever of the source Observables first
240-
* emitted an item
241+
* @return an Observable that emits the same sequence as whichever of the source Observables first
242+
* emitted an item or sent a termination notification
241243
* @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
242244
*/
243245
public final static <T> Observable<T> amb(Observable<? extends T> o1, Observable<? extends T> o2) {
244246
return create(OnSubscribeAmb.amb(o1, o2));
245247
}
246248

247249
/**
248-
* Given three Observables, mirrors the one that first emits an item.
250+
* Given three Observables, mirrors the one that first either emits an item or sends a termination
251+
* notification.
249252
* <p>
250253
* <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.png" alt="">
251254
* <dl>
@@ -259,16 +262,17 @@ public final static <T> Observable<T> amb(Observable<? extends T> o1, Observable
259262
* an Observable competing to react first
260263
* @param o3
261264
* an Observable competing to react first
262-
* @return an Observable that emits the same sequence of items as whichever of the source Observables first
263-
* emitted an item
265+
* @return an Observable that emits the same sequence as whichever of the source Observables first
266+
* emitted an item or sent a termination notification
264267
* @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
265268
*/
266269
public final static <T> Observable<T> amb(Observable<? extends T> o1, Observable<? extends T> o2, Observable<? extends T> o3) {
267270
return create(OnSubscribeAmb.amb(o1, o2, o3));
268271
}
269272

270273
/**
271-
* Given four Observables, mirrors the one that first emits an item.
274+
* Given four Observables, mirrors the one that first either emits an item or sends a termination
275+
* notification.
272276
* <p>
273277
* <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.png" alt="">
274278
* <dl>
@@ -284,16 +288,17 @@ public final static <T> Observable<T> amb(Observable<? extends T> o1, Observable
284288
* an Observable competing to react first
285289
* @param o4
286290
* an Observable competing to react first
287-
* @return an Observable that emits the same sequence of items as whichever of the source Observables first
288-
* emitted an item
291+
* @return an Observable that emits the same sequence as whichever of the source Observables first
292+
* emitted an item or sent a termination notification
289293
* @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
290294
*/
291295
public final static <T> Observable<T> amb(Observable<? extends T> o1, Observable<? extends T> o2, Observable<? extends T> o3, Observable<? extends T> o4) {
292296
return create(OnSubscribeAmb.amb(o1, o2, o3, o4));
293297
}
294298

295299
/**
296-
* Given five Observables, mirrors the one that first emits an item.
300+
* Given five Observables, mirrors the one that first either emits an item or sends a termination
301+
* notification.
297302
* <p>
298303
* <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.png" alt="">
299304
* <dl>
@@ -311,16 +316,17 @@ public final static <T> Observable<T> amb(Observable<? extends T> o1, Observable
311316
* an Observable competing to react first
312317
* @param o5
313318
* an Observable competing to react first
314-
* @return an Observable that emits the same sequence of items as whichever of the source Observables first
315-
* emitted an item
319+
* @return an Observable that emits the same sequence as whichever of the source Observables first
320+
* emitted an item or sent a termination notification
316321
* @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
317322
*/
318323
public final static <T> Observable<T> amb(Observable<? extends T> o1, Observable<? extends T> o2, Observable<? extends T> o3, Observable<? extends T> o4, Observable<? extends T> o5) {
319324
return create(OnSubscribeAmb.amb(o1, o2, o3, o4, o5));
320325
}
321326

322327
/**
323-
* Given six Observables, mirrors the one that first emits an item.
328+
* Given six Observables, mirrors the one that first either emits an item or sends a termination
329+
* notification.
324330
* <p>
325331
* <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.png" alt="">
326332
* <dl>
@@ -340,16 +346,17 @@ public final static <T> Observable<T> amb(Observable<? extends T> o1, Observable
340346
* an Observable competing to react first
341347
* @param o6
342348
* an Observable competing to react first
343-
* @return an Observable that emits the same sequence of items as whichever of the source Observables first
344-
* emitted an item
349+
* @return an Observable that emits the same sequence as whichever of the source Observables first
350+
* emitted an item or sent a termination notification
345351
* @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
346352
*/
347353
public final static <T> Observable<T> amb(Observable<? extends T> o1, Observable<? extends T> o2, Observable<? extends T> o3, Observable<? extends T> o4, Observable<? extends T> o5, Observable<? extends T> o6) {
348354
return create(OnSubscribeAmb.amb(o1, o2, o3, o4, o5, o6));
349355
}
350356

351357
/**
352-
* Given seven Observables, mirrors the one that first emits an item.
358+
* Given seven Observables, mirrors the one that first either emits an item or sends a termination
359+
* notification.
353360
* <p>
354361
* <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.png" alt="">
355362
* <dl>
@@ -371,16 +378,17 @@ public final static <T> Observable<T> amb(Observable<? extends T> o1, Observable
371378
* an Observable competing to react first
372379
* @param o7
373380
* an Observable competing to react first
374-
* @return an Observable that emits the same sequence of items as whichever of the source Observables first
375-
* emitted an item
381+
* @return an Observable that emits the same sequence as whichever of the source Observables first
382+
* emitted an item or sent a termination notification
376383
* @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
377384
*/
378385
public final static <T> Observable<T> amb(Observable<? extends T> o1, Observable<? extends T> o2, Observable<? extends T> o3, Observable<? extends T> o4, Observable<? extends T> o5, Observable<? extends T> o6, Observable<? extends T> o7) {
379386
return create(OnSubscribeAmb.amb(o1, o2, o3, o4, o5, o6, o7));
380387
}
381388

382389
/**
383-
* Given eight Observables, mirrors the one that first emits an item.
390+
* Given eight Observables, mirrors the one that first either emits an item or sends a termination
391+
* notification.
384392
* <p>
385393
* <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.png" alt="">
386394
* <dl>
@@ -404,16 +412,17 @@ public final static <T> Observable<T> amb(Observable<? extends T> o1, Observable
404412
* an Observable competing to react first
405413
* @param o8
406414
* an observable competing to react first
407-
* @return an Observable that emits the same sequence of items as whichever of the source Observables first
408-
* emitted an item
415+
* @return an Observable that emits the same sequence as whichever of the source Observables first
416+
* emitted an item or sent a termination notification
409417
* @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
410418
*/
411419
public final static <T> Observable<T> amb(Observable<? extends T> o1, Observable<? extends T> o2, Observable<? extends T> o3, Observable<? extends T> o4, Observable<? extends T> o5, Observable<? extends T> o6, Observable<? extends T> o7, Observable<? extends T> o8) {
412420
return create(OnSubscribeAmb.amb(o1, o2, o3, o4, o5, o6, o7, o8));
413421
}
414422

415423
/**
416-
* Given nine Observables, mirrors the one that first emits an item.
424+
* Given nine Observables, mirrors the one that first either emits an item or sends a termination
425+
* notification.
417426
* <p>
418427
* <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.png" alt="">
419428
* <dl>
@@ -439,8 +448,8 @@ public final static <T> Observable<T> amb(Observable<? extends T> o1, Observable
439448
* an Observable competing to react first
440449
* @param o9
441450
* an Observable competing to react first
442-
* @return an Observable that emits the same sequence of items as whichever of the source Observables first
443-
* emitted an item
451+
* @return an Observable that emits the same sequence as whichever of the source Observables first
452+
* emitted an item or sent a termination notification
444453
* @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
445454
*/
446455
public final static <T> Observable<T> amb(Observable<? extends T> o1, Observable<? extends T> o2, Observable<? extends T> o3, Observable<? extends T> o4, Observable<? extends T> o5, Observable<? extends T> o6, Observable<? extends T> o7, Observable<? extends T> o8, Observable<? extends T> o9) {
@@ -2974,7 +2983,8 @@ public final Observable<Boolean> all(Func1<? super T, Boolean> predicate) {
29742983
}
29752984

29762985
/**
2977-
* Mirrors the first Observable (current or provided) that emits an item.
2986+
* Mirrors the Observable (current or provided) that first either emits an item or sends a termination
2987+
* notification.
29782988
* <p>
29792989
* <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.png" alt="">
29802990
* <dl>
@@ -2984,8 +2994,8 @@ public final Observable<Boolean> all(Func1<? super T, Boolean> predicate) {
29842994
*
29852995
* @param t1
29862996
* an Observable competing to react first
2987-
* @return an Observable that emits the same sequence of items as whichever of the source Observables first
2988-
* emitted an item
2997+
* @return an Observable that emits the same sequence as whichever of the source Observables first
2998+
* emitted an item or sent a termination notification
29892999
* @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
29903000
*/
29913001
public final Observable<T> ambWith(Observable<? extends T> t1) {

0 commit comments

Comments
 (0)