Skip to content

Commit 965a212

Browse files
author
Joachim Hofer
committed
fixed all the javadoc build warnings
1 parent 2afbe5c commit 965a212

File tree

2 files changed

+22
-43
lines changed

2 files changed

+22
-43
lines changed

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

Lines changed: 19 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import java.util.ArrayList;
2121
import java.util.Arrays;
22-
import java.util.Collection;
2322
import java.util.List;
2423
import java.util.concurrent.Future;
2524
import java.util.concurrent.TimeUnit;
@@ -544,7 +543,7 @@ public static <T> Observable<T> from(Iterable<? extends T> iterable) {
544543
* <p>Implementation note: the entire iterable sequence will be immediately emitted each time an {@link Observer} subscribes. Since this occurs before the {@link Subscription} is returned,
545544
* it in not possible to unsubscribe from the sequence before it completes.
546545
*
547-
* @param array
546+
* @param items
548547
* the source sequence
549548
* @param <T>
550549
* the type of items in the {@link Iterable} sequence and the type of items to be
@@ -1434,7 +1433,7 @@ public static <T> Observable<T> mergeDelayError(Observable<? extends Observable<
14341433
}
14351434

14361435
/**
1437-
* This behaves like {@link #merge(Observable...)} except that if any of the merged Observables
1436+
* This behaves like {@link #merge(Observable, Observable)} except that if any of the merged Observables
14381437
* notify of an error via {@link Observer#onError onError}, {@code mergeDelayError} will
14391438
* refrain from propagating that error notification until all of the merged Observables have
14401439
* finished emitting items.
@@ -1462,7 +1461,7 @@ public static <T> Observable<T> mergeDelayError(Observable<? extends T> t1, Obse
14621461
}
14631462

14641463
/**
1465-
* This behaves like {@link #merge(Observable...)} except that if any of the merged Observables
1464+
* This behaves like {@link #merge(Observable, Observable, Observable)} except that if any of the merged Observables
14661465
* notify of an error via {@link Observer#onError onError}, {@code mergeDelayError} will
14671466
* refrain from propagating that error notification until all of the merged Observables have
14681467
* finished emitting items.
@@ -1492,7 +1491,7 @@ public static <T> Observable<T> mergeDelayError(Observable<? extends T> t1, Obse
14921491
}
14931492

14941493
/**
1495-
* This behaves like {@link #merge(Observable...)} except that if any of the merged Observables
1494+
* This behaves like {@link #merge(Observable, Observable, Observable, Observable)} except that if any of the merged Observables
14961495
* notify of an error via {@link Observer#onError onError}, {@code mergeDelayError} will
14971496
* refrain from propagating that error notification until all of the merged Observables have
14981497
* finished emitting items.
@@ -1524,7 +1523,7 @@ public static <T> Observable<T> mergeDelayError(Observable<? extends T> t1, Obse
15241523
}
15251524

15261525
/**
1527-
* This behaves like {@link #merge(Observable...)} except that if any of the merged Observables
1526+
* This behaves like {@link #merge(Observable, Observable, Observable, Observable, Observable)} except that if any of the merged Observables
15281527
* notify of an error via {@link Observer#onError onError}, {@code mergeDelayError} will
15291528
* refrain from propagating that error notification until all of the merged Observables have
15301529
* finished emitting items.
@@ -1558,7 +1557,7 @@ public static <T> Observable<T> mergeDelayError(Observable<? extends T> t1, Obse
15581557
}
15591558

15601559
/**
1561-
* This behaves like {@link #merge(Observable...)} except that if any of the merged Observables
1560+
* This behaves like {@link #merge(Observable, Observable, Observable, Observable, Observable, Observable)} except that if any of the merged Observables
15621561
* notify of an error via {@link Observer#onError onError}, {@code mergeDelayError} will
15631562
* refrain from propagating that error notification until all of the merged Observables have
15641563
* finished emitting items.
@@ -1594,7 +1593,7 @@ public static <T> Observable<T> mergeDelayError(Observable<? extends T> t1, Obse
15941593
}
15951594

15961595
/**
1597-
* This behaves like {@link #merge(Observable...)} except that if any of the merged Observables
1596+
* This behaves like {@link #merge(Observable, Observable, Observable, Observable, Observable, Observable, Observable)} except that if any of the merged Observables
15981597
* notify of an error via {@link Observer#onError onError}, {@code mergeDelayError} will
15991598
* refrain from propagating that error notification until all of the merged Observables have
16001599
* finished emitting items.
@@ -1632,7 +1631,7 @@ public static <T> Observable<T> mergeDelayError(Observable<? extends T> t1, Obse
16321631
}
16331632

16341633
/**
1635-
* This behaves like {@link #merge(Observable...)} except that if any of the merged Observables
1634+
* This behaves like {@link #merge(Observable, Observable, Observable, Observable, Observable, Observable, Observable, Observable)} except that if any of the merged Observables
16361635
* notify of an error via {@link Observer#onError onError}, {@code mergeDelayError} will
16371636
* refrain from propagating that error notification until all of the merged Observables have
16381637
* finished emitting items.
@@ -1672,7 +1671,7 @@ public static <T> Observable<T> mergeDelayError(Observable<? extends T> t1, Obse
16721671
}
16731672

16741673
/**
1675-
* This behaves like {@link #merge(Observable...)} except that if any of the merged Observables
1674+
* This behaves like {@link #merge(Observable, Observable, Observable, Observable, Observable, Observable, Observable, Observable, Observable)} except that if any of the merged Observables
16761675
* notify of an error via {@link Observer#onError onError}, {@code mergeDelayError} will
16771676
* refrain from propagating that error notification until all of the merged Observables have
16781677
* finished emitting items.
@@ -1832,7 +1831,7 @@ public static Observable<Long> interval(long interval, TimeUnit unit, Scheduler
18321831
* The {@link TimeUnit} for the timeout.
18331832
*
18341833
* @return An {@link Observable} which filters out values which are too quickly followed up with newer values.
1835-
* @see {@link #throttleWithTimeout};
1834+
* @see #throttleWithTimeout(long, TimeUnit)
18361835
*/
18371836
public Observable<T> debounce(long timeout, TimeUnit unit) {
18381837
return create(OperationDebounce.debounce(this, timeout, unit));
@@ -1860,7 +1859,7 @@ public Observable<T> debounce(long timeout, TimeUnit unit) {
18601859
* @param scheduler
18611860
* The {@link Scheduler} to use internally to manage the timers which handle timeout for each event.
18621861
* @return Observable which performs the throttle operation.
1863-
* @see {@link #throttleWithTimeout};
1862+
* @see #throttleWithTimeout(long, TimeUnit, Scheduler)
18641863
*/
18651864
public Observable<T> debounce(long timeout, TimeUnit unit, Scheduler scheduler) {
18661865
return create(OperationDebounce.debounce(this, timeout, unit, scheduler));
@@ -1887,7 +1886,7 @@ public Observable<T> debounce(long timeout, TimeUnit unit, Scheduler scheduler)
18871886
* The {@link TimeUnit} for the timeout.
18881887
*
18891888
* @return An {@link Observable} which filters out values which are too quickly followed up with newer values.
1890-
* @see {@link #debounce}
1889+
* @see #debounce(long, TimeUnit)
18911890
*/
18921891
public Observable<T> throttleWithTimeout(long timeout, TimeUnit unit) {
18931892
return create(OperationDebounce.debounce(this, timeout, unit));
@@ -1907,7 +1906,7 @@ public Observable<T> throttleWithTimeout(long timeout, TimeUnit unit) {
19071906
* @param scheduler
19081907
* The {@link Scheduler} to use internally to manage the timers which handle timeout for each event.
19091908
* @return Observable which performs the throttle operation.
1910-
* @see {@link #debounce}
1909+
* @see #debounce(long, TimeUnit, Scheduler)
19111910
*/
19121911
public Observable<T> throttleWithTimeout(long timeout, TimeUnit unit, Scheduler scheduler) {
19131912
return create(OperationDebounce.debounce(this, timeout, unit, scheduler));
@@ -1920,7 +1919,7 @@ public Observable<T> throttleWithTimeout(long timeout, TimeUnit unit, Scheduler
19201919
* <p>
19211920
* <img width="640" src="https://github.com/Netflix/RxJava/wiki/images/rx-operators/throttleFirst.png">
19221921
*
1923-
* @param skipDuration
1922+
* @param windowDuration
19241923
* Time to wait before sending another value after emitting last value.
19251924
* @param unit
19261925
* The unit of time for the specified timeout.
@@ -1961,7 +1960,7 @@ public Observable<T> throttleFirst(long skipDuration, TimeUnit unit, Scheduler s
19611960
* @param unit
19621961
* The unit of time for the specified interval.
19631962
* @return Observable which performs the throttle operation.
1964-
* @see {@link #sample(long, TimeUnit)}
1963+
* @see #sample(long, TimeUnit)
19651964
*/
19661965
public Observable<T> throttleLast(long intervalDuration, TimeUnit unit) {
19671966
return sample(intervalDuration, unit);
@@ -1979,7 +1978,7 @@ public Observable<T> throttleLast(long intervalDuration, TimeUnit unit) {
19791978
* @param unit
19801979
* The unit of time for the specified interval.
19811980
* @return Observable which performs the throttle operation.
1982-
* @see {@link #sample(long, TimeUnit, Scheduler)}
1981+
* @see #sample(long, TimeUnit, Scheduler)
19831982
*/
19841983
public Observable<T> throttleLast(long intervalDuration, TimeUnit unit, Scheduler scheduler) {
19851984
return sample(intervalDuration, unit, scheduler);
@@ -2725,7 +2724,7 @@ public Observable<Observable<T>> window(int count) {
27252724
* The maximum size of each window before it should be emitted.
27262725
* @param skip
27272726
* How many produced values need to be skipped before starting a new window. Note that when "skip" and
2728-
* "count" are equals that this is the same operation as {@link Observable#window(Observable, int)}.
2727+
* "count" are equals that this is the same operation as {@link #window(int)}.
27292728
* @return
27302729
* An {@link Observable} which produces windows every "skipped" values containing at most
27312730
* "count" produced values.
@@ -3332,9 +3331,6 @@ public Observable<T> retry(int retryCount) {
33323331
* <p>
33333332
* For example, if an Observable fails on first time but emits [1, 2] then succeeds the second time and
33343333
* emits [1, 2, 3, 4, 5] then the complete output would be [1, 2, 1, 2, 3, 4, 5, onCompleted].
3335-
*
3336-
* @param retryCount
3337-
* Number of retry attempts before failing.
33383334
* @return Observable with retry logic.
33393335
*/
33403336
public Observable<T> retry() {
@@ -3655,7 +3651,7 @@ public Observable<T> takeWhileWithIndex(final Func2<? super T, ? super Integer,
36553651
* @return an Observable that emits only the very first item from the source, or none if the
36563652
* source Observable completes without emitting a single item.
36573653
* @see <a href="http://msdn.microsoft.com/en-us/library/hh229177%28v=vs.103%29.aspx">MSDN: Observable.First</a>
3658-
* @see {@link #first()}
3654+
* @see #first()
36593655
*/
36603656
public Observable<T> takeFirst() {
36613657
return first();
@@ -3670,7 +3666,7 @@ public Observable<T> takeFirst() {
36703666
* @return an Observable that emits only the very first item satisfying the given condition from the source,
36713667
* or none if the source Observable completes without emitting a single matching item.
36723668
* @see <a href="http://msdn.microsoft.com/en-us/library/hh229177%28v=vs.103%29.aspx">MSDN: Observable.First</a>
3673-
* @see {@link #first(Func1)}
3669+
* @see #first(Func1)
36743670
*/
36753671
public Observable<T> takeFirst(Func1<? super T, Boolean> predicate) {
36763672
return first(predicate);
@@ -3810,8 +3806,6 @@ public Observable<T> startWith(Iterable<T> values) {
38103806
*
38113807
* @param t1
38123808
* item to include
3813-
* @param values
3814-
* Iterable of the items you want the modified Observable to emit first
38153809
* @return an Observable that exhibits the modified behavior
38163810
*/
38173811
public Observable<T> startWith(T t1) {
@@ -3827,8 +3821,6 @@ public Observable<T> startWith(T t1) {
38273821
* item to include
38283822
* @param t2
38293823
* item to include
3830-
* @param values
3831-
* Iterable of the items you want the modified Observable to emit first
38323824
* @return an Observable that exhibits the modified behavior
38333825
*/
38343826
public Observable<T> startWith(T t1, T t2) {
@@ -3846,8 +3838,6 @@ public Observable<T> startWith(T t1, T t2) {
38463838
* item to include
38473839
* @param t3
38483840
* item to include
3849-
* @param values
3850-
* Iterable of the items you want the modified Observable to emit first
38513841
* @return an Observable that exhibits the modified behavior
38523842
*/
38533843
public Observable<T> startWith(T t1, T t2, T t3) {
@@ -3867,8 +3857,6 @@ public Observable<T> startWith(T t1, T t2, T t3) {
38673857
* item to include
38683858
* @param t4
38693859
* item to include
3870-
* @param values
3871-
* Iterable of the items you want the modified Observable to emit first
38723860
* @return an Observable that exhibits the modified behavior
38733861
*/
38743862
public Observable<T> startWith(T t1, T t2, T t3, T t4) {
@@ -3890,8 +3878,6 @@ public Observable<T> startWith(T t1, T t2, T t3, T t4) {
38903878
* item to include
38913879
* @param t5
38923880
* item to include
3893-
* @param values
3894-
* Iterable of the items you want the modified Observable to emit first
38953881
* @return an Observable that exhibits the modified behavior
38963882
*/
38973883
public Observable<T> startWith(T t1, T t2, T t3, T t4, T t5) {
@@ -3915,8 +3901,6 @@ public Observable<T> startWith(T t1, T t2, T t3, T t4, T t5) {
39153901
* item to include
39163902
* @param t6
39173903
* item to include
3918-
* @param values
3919-
* Iterable of the items you want the modified Observable to emit first
39203904
* @return an Observable that exhibits the modified behavior
39213905
*/
39223906
public Observable<T> startWith(T t1, T t2, T t3, T t4, T t5, T t6) {
@@ -3942,8 +3926,6 @@ public Observable<T> startWith(T t1, T t2, T t3, T t4, T t5, T t6) {
39423926
* item to include
39433927
* @param t7
39443928
* item to include
3945-
* @param values
3946-
* Iterable of the items you want the modified Observable to emit first
39473929
* @return an Observable that exhibits the modified behavior
39483930
*/
39493931
public Observable<T> startWith(T t1, T t2, T t3, T t4, T t5, T t6, T t7) {
@@ -3971,8 +3953,6 @@ public Observable<T> startWith(T t1, T t2, T t3, T t4, T t5, T t6, T t7) {
39713953
* item to include
39723954
* @param t8
39733955
* item to include
3974-
* @param values
3975-
* Iterable of the items you want the modified Observable to emit first
39763956
* @return an Observable that exhibits the modified behavior
39773957
*/
39783958
public Observable<T> startWith(T t1, T t2, T t3, T t4, T t5, T t6, T t7, T t8) {
@@ -4002,8 +3982,6 @@ public Observable<T> startWith(T t1, T t2, T t3, T t4, T t5, T t6, T t7, T t8) {
40023982
* item to include
40033983
* @param t9
40043984
* item to include
4005-
* @param values
4006-
* Iterable of the items you want the modified Observable to emit first
40073985
* @return an Observable that exhibits the modified behavior
40083986
*/
40093987
public Observable<T> startWith(T t1, T t2, T t3, T t4, T t5, T t6, T t7, T t8, T t9) {

rxjava-core/src/main/java/rx/operators/ChunkedOperation.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ protected interface ChunkCreator {
6161
*
6262
* @param <T>
6363
* The type of objects which this {@link Chunk} can hold.
64-
* <C> The type of object being tracked by the {@link Chunk}
64+
* @param <C>
65+
* The type of object being tracked by the {@link Chunk}
6566
*/
6667
protected abstract static class Chunk<T, C> {
6768
protected final List<T> contents = new ArrayList<T>();
@@ -78,7 +79,7 @@ public void pushValue(T value) {
7879

7980
/**
8081
* @return
81-
* The mutable underlying {@link C} which contains all the
82+
* The mutable underlying {@code C} which contains all the
8283
* recorded values in this {@link Chunk} object.
8384
*/
8485
abstract public C getContents();

0 commit comments

Comments
 (0)