Skip to content

Commit 83829c8

Browse files
committed
* corrects grammar of sequenceEqual() javadoc
* updates link to wiki description of count() * adds sample(sampler) marble diagram/wiki link * adds longCount() marble diagram/wiki link
1 parent 1efd150 commit 83829c8

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2297,16 +2297,16 @@ public static <T> Observable<T> from(Future<? extends T> future, long timeout, T
22972297
}
22982298

22992299
/**
2300-
* Returns an Observable that emits a Boolean value that indicate
2300+
* Returns an Observable that emits a Boolean value that indicates
23012301
* whether two sequences are equal by comparing the elements pairwise.
23022302
* <p>
23032303
* <img width="640" src="https://raw.github.com/wiki/Netflix/RxJava/images/rx-operators/sequenceEqual.png">
23042304
*
23052305
* @param first the first Observable to compare
23062306
* @param second the second Observable to compare
23072307
* @param <T> the type of items emitted by each Observable
2308-
* @return an Observable that emits a Boolean value that indicate
2309-
* whether two sequences are equal by comparing the elements pairwise.
2308+
* @return an Observable that emits a Boolean value that indicates
2309+
* whether two sequences are equal by comparing the elements pairwise
23102310
* @see <a href="https://github.com/Netflix/RxJava/wiki/Observable-Utility-Operators#sequenceequal">RxJava Wiki: sequenceEqual()</a>
23112311
*/
23122312
public static <T> Observable<Boolean> sequenceEqual(Observable<? extends T> first, Observable<? extends T> second) {
@@ -2322,7 +2322,7 @@ public Boolean call(T first, T second) {
23222322
}
23232323

23242324
/**
2325-
* Returns an Observable that emits a Boolean value that indicate
2325+
* Returns an Observable that emits a Boolean value that indicates
23262326
* whether two sequences are equal by comparing the elements pairwise
23272327
* based on the results of a specified equality function.
23282328
* <p>
@@ -2333,8 +2333,8 @@ public Boolean call(T first, T second) {
23332333
* @param equality a function used to compare items emitted by both
23342334
* Observables
23352335
* @param <T> the type of items emitted by each Observable
2336-
* @return an Observable that emits a Boolean value that indicate
2337-
* whether two sequences are equal by comparing the elements pairwise.
2336+
* @return an Observable that emits a Boolean value that indicates
2337+
* whether two sequences are equal by comparing the elements pairwise
23382338
* @see <a href="https://github.com/Netflix/RxJava/wiki/Observable-Utility-Operators#sequenceequal">RxJava Wiki: sequenceEqual()</a>
23392339
*/
23402340
public static <T> Observable<Boolean> sequenceEqual(Observable<? extends T> first, Observable<? extends T> second, Func2<? super T, ? super T, Boolean> equality) {
@@ -3871,7 +3871,7 @@ public Observable<T> reduce(Func2<T, T, T> accumulator) {
38713871
*
38723872
* @return an Observable that emits the number of counted elements of the
38733873
* source Observable as its single item
3874-
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-Operators#count">RxJava Wiki: count()</a>
3874+
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-Operators#count-and-longcount">RxJava Wiki: count()</a>
38753875
* @see <a href="http://msdn.microsoft.com/en-us/library/hh229470.aspx">MSDN: Observable.Count</a>
38763876
* @see #longCount()
38773877
*/
@@ -4475,12 +4475,14 @@ public Observable<T> sample(long period, TimeUnit unit, Scheduler scheduler) {
44754475
* Return an Observable that emits the results of sampling the items
44764476
* emitted by this Observable when the <code>sampler</code>
44774477
* Observable produces an item or completes.
4478+
* <p>
4479+
* <img width="640" src="https://raw.github.com/wiki/Netflix/RxJava/images/rx-operators/sample.o.png">
44784480
*
44794481
* @param sampler the Observable to use for sampling this
4480-
*
44814482
* @return an Observable that emits the results of sampling the items
44824483
* emitted by this Observable when the <code>sampler</code>
44834484
* Observable produces an item or completes.
4485+
* @see <a href="https://github.com/Netflix/RxJava/wiki/Filtering-Observables#sample-or-throttlelast">RxJava Wiki: sample()</a>
44844486
*/
44854487
public <U> Observable<T> sample(Observable<U> sampler) {
44864488
return create(new OperationSample.SampleWithObservable<T, U>(this, sampler));
@@ -5198,11 +5200,11 @@ public Observable<T> last() {
51985200
* Returns an Observable that counts the total number of items in the
51995201
* source Observable as a 64 bit long.
52005202
* <p>
5201-
* <img width="640" src="https://raw.github.com/wiki/Netflix/RxJava/images/rx-operators/count.png">
5203+
* <img width="640" src="https://raw.github.com/wiki/Netflix/RxJava/images/rx-operators/longCount.png">
52025204
*
52035205
* @return an Observable that emits the number of counted elements of the
52045206
* source Observable as its single, 64 bit long item
5205-
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-Operators#count">RxJava Wiki: count()</a>
5207+
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-Operators#count-and-longcount">RxJava Wiki: count()</a>
52065208
* @see <a href="http://msdn.microsoft.com/en-us/library/hh229120.aspx">MSDN: Observable.LongCount</a>
52075209
* @see #count()
52085210
*/

0 commit comments

Comments
 (0)