Skip to content

Commit a0ebbc7

Browse files
committed
fixing a variety of errors in javadoc generation (syntax errors, misnamed params, etc.)
1 parent 940c26e commit a0ebbc7

13 files changed

+453
-411
lines changed

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

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ public static interface OnSubscribeFunc<T> extends Function {
259259
* observable.map(...).filter(...).take(5).lift(new ObserverA()).lift(new ObserverB(...)).subscribe()
260260
* }
261261
*
262-
* @param bind
262+
* @param lift
263263
* @return an Observable that emits values that are the result of applying the bind function to the values
264264
* of the current Observable
265265
*/
@@ -1552,7 +1552,7 @@ public final static <T> Observable<T> from(T t1, T t2, T t3, T t4, T t5, T t6, T
15521552
* <p>
15531553
* <img width="640" src="https://raw.github.com/wiki/Netflix/RxJava/images/rx-operators/from.png">
15541554
*
1555-
* @param items
1555+
* @param t1
15561556
* the source Array
15571557
* @param <T>
15581558
* the type of items in the Array and the type of items to be emitted by the resulting Observable
@@ -1680,7 +1680,7 @@ public final static <T> Observable<T> just(T value, Scheduler scheduler) {
16801680
* if the source is empty
16811681
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#wiki-max">RxJava Wiki: max()</a>
16821682
* @see <a href="http://msdn.microsoft.com/en-us/library/hh211837.aspx">MSDN: Observable.Max</a>
1683-
* @deprecated Use rxjava-math module instead
1683+
* @deprecated use rxjava-math module instead
16841684
*/
16851685
public final static <T extends Comparable<? super T>> Observable<T> max(Observable<T> source) {
16861686
return OperationMinMax.max(source);
@@ -2680,7 +2680,7 @@ public final static <T> Observable<T> switchDo(Observable<? extends Observable<?
26802680
* @return an Observable that emits the items emitted by the Observable most recently emitted by the source
26812681
* Observable
26822682
* @see <a href="https://github.com/Netflix/RxJava/wiki/Combining-Observables#wiki-switchonnext">RxJava Wiki: switchOnNext()</a>
2683-
* @see {@link #switchOnNext(Observable)}
2683+
* @see #switchOnNext(Observable)
26842684
*/
26852685
public final static <T> Observable<T> switchLatest(Observable<? extends Observable<? extends T>> sequenceOfSequences) {
26862686
return create(OperationSwitch.switchDo(sequenceOfSequences));
@@ -4308,7 +4308,7 @@ public final void onNext(T args) {
43084308
* <p>
43094309
* <img width="640" src="https://raw.github.com/wiki/Netflix/RxJava/images/rx-operators/doOnEach.png">
43104310
*
4311-
* @param observer
4311+
* @param onNotification
43124312
* the action to invoke for each item emitted by the source Observable
43134313
* @return the source Observable with the side-effecting behavior applied
43144314
* @see <a href="https://github.com/Netflix/RxJava/wiki/Observable-Utility-Operators#wiki-dooneach">RxJava Wiki: doOnEach()</a>
@@ -4503,7 +4503,7 @@ public final Observable<T> elementAtOrDefault(int index, T defaultValue) {
45034503
* @return an Observable that emits a Boolean that indicates whether any item emitted by the source
45044504
* Observable satisfies the {@code predicate}
45054505
* @see <a href="https://github.com/Netflix/RxJava/wiki/Conditional-and-Boolean-Operators#wiki-exists-and-isempty">RxJava Wiki: exists()</a>
4506-
* @see <a href="http://msdn.microsoft.com/en-us/library/hh211993.aspx">MSDN: Observable.Any</a> Note: the description in this page was wrong at the time of this writing.
4506+
* @see <a href="http://msdn.microsoft.com/en-us/library/hh211993.aspx">MSDN: Observable.Any (Note: the description in this page was wrong at the time of this writing)</a>
45074507
*/
45084508
public final Observable<Boolean> exists(Func1<? super T, Boolean> predicate) {
45094509
return create(OperationAny.exists(this, predicate));
@@ -4551,7 +4551,7 @@ public final Observable<T> finallyDo(Action0 action) {
45514551
* @return an Observable that emits only the very first item emitted by the source Observable, or raises an
45524552
* {@code IllegalArgumentException} if the source Observable is empty
45534553
* @see <a href="https://github.com/Netflix/RxJava/wiki/Filtering-Observables#wiki-first">RxJava Wiki: first()</a>
4554-
* @see MSDN: {@code Observable.firstAsync()}
4554+
* @see "MSDN: Observable.firstAsync()"
45554555
*/
45564556
public final Observable<T> first() {
45574557
return take(1).single();
@@ -4568,7 +4568,7 @@ public final Observable<T> first() {
45684568
* @return an Observable that emits only the very first item emitted by the source Observable that satisfies
45694569
* the {@code predicate}, or raises an {@code IllegalArgumentException} if no such items are emitted
45704570
* @see <a href="https://github.com/Netflix/RxJava/wiki/Filtering-Observables#wiki-first">RxJava Wiki: first()</a>
4571-
* @see MSDN: {@code Observable.firstAsync()}
4571+
* @see "MSDN: Observable.firstAsync()"
45724572
*/
45734573
public final Observable<T> first(Func1<? super T, Boolean> predicate) {
45744574
return takeFirst(predicate).single();
@@ -4585,7 +4585,7 @@ public final Observable<T> first(Func1<? super T, Boolean> predicate) {
45854585
* @return an Observable that emits only the very first item from the source, or a default item if the
45864586
* source Observable completes without emitting any items
45874587
* @see <a href="https://github.com/Netflix/RxJava/wiki/Filtering-Observables#wiki-firstordefault">RxJava Wiki: firstOrDefault()</a>
4588-
* @see MSDN: {@code Observable.firstOrDefaultAsync()}
4588+
* @see "MSDN: Observable.firstOrDefaultAsync()"
45894589
*/
45904590
public final Observable<T> firstOrDefault(T defaultValue) {
45914591
return take(1).singleOrDefault(defaultValue);
@@ -4605,7 +4605,7 @@ public final Observable<T> firstOrDefault(T defaultValue) {
46054605
* @return an Observable that emits only the very first item emitted by the source Observable that satisfies
46064606
* the {@code predicate}, or a default item if the source Observable emits no such items
46074607
* @see <a href="https://github.com/Netflix/RxJava/wiki/Filtering-Observables#wiki-firstordefault">RxJava Wiki: firstOrDefault()</a>
4608-
* @see MSDN: {@code Observable.firstOrDefaultAsync()}
4608+
* @see "MSDN: Observable.firstOrDefaultAsync()"
46094609
*/
46104610
public final Observable<T> firstOrDefault(T defaultValue, Func1<? super T, Boolean> predicate) {
46114611
return takeFirst(predicate).singleOrDefault(defaultValue);
@@ -4784,7 +4784,7 @@ public final <TRight, TLeftDuration, TRightDuration, R> Observable<R> join(Obser
47844784
* @return an Observable that emits the last item from the source Observable or notifies observers of an
47854785
* error
47864786
* @see <a href="https://github.com/Netflix/RxJava/wiki/Filtering-Observable-Operators#wiki-last">RxJava Wiki: last()</a>
4787-
* @see MSDN: {@code Observable.lastAsync()}
4787+
* @see "MSDN: Observable.lastAsync()"
47884788
*/
47894789
public final Observable<T> last() {
47904790
return takeLast(1).single();
@@ -4803,7 +4803,7 @@ public final Observable<T> last() {
48034803
* @throws IllegalArgumentException
48044804
* if no items that match the predicate are emitted by the source Observable
48054805
* @see <a href="https://github.com/Netflix/RxJava/wiki/Filtering-Observable-Operators#wiki-last">RxJava Wiki: last()</a>
4806-
* @see MSDN: {@code Observable.lastAsync()}
4806+
* @see "MSDN: Observable.lastAsync()"
48074807
*/
48084808
public final Observable<T> last(Func1<? super T, Boolean> predicate) {
48094809
return filter(predicate).takeLast(1).single();
@@ -4820,7 +4820,7 @@ public final Observable<T> last(Func1<? super T, Boolean> predicate) {
48204820
* @return an Observable that emits only the last item emitted by the source Observable, or a default item
48214821
* if the source Observable is empty
48224822
* @see <a href="https://github.com/Netflix/RxJava/wiki/Filtering-Observables#wiki-lastOrDefault">RxJava Wiki: lastOrDefault()</a>
4823-
* @see MSDN: {@code Observable.lastOrDefaultAsync()}
4823+
* @see "MSDN: Observable.lastOrDefaultAsync()"
48244824
*/
48254825
public final Observable<T> lastOrDefault(T defaultValue) {
48264826
return takeLast(1).singleOrDefault(defaultValue);
@@ -4840,7 +4840,7 @@ public final Observable<T> lastOrDefault(T defaultValue) {
48404840
* @return an Observable that emits only the last item emitted by the source Observable that satisfies the
48414841
* given condition, or a default item if no such item is emitted by the source Observable
48424842
* @see <a href="https://github.com/Netflix/RxJava/wiki/Filtering-Observables#wiki-lastOrDefault">RxJava Wiki: lastOrDefault()</a>
4843-
* @see MSDN: {@code Observable.lastOrDefaultAsync()}
4843+
* @see "MSDN: Observable.lastOrDefaultAsync()"
48444844
*/
48454845
public final Observable<T> lastOrDefault(T defaultValue, Func1<? super T, Boolean> predicate) {
48464846
return filter(predicate).takeLast(1).singleOrDefault(defaultValue);
@@ -5355,7 +5355,7 @@ public final Observable<T> onExceptionResumeNext(final Observable<? extends T> r
53555355
* @param f
53565356
* a {@link Func1} that applies Observable Observers to {@code Observable<T>} in parallel and
53575357
* returns an {@code Observable<R>}
5358-
* @return an Observable that emits the results of applying {@link f} to the items emitted by the source
5358+
* @return an Observable that emits the results of applying {@code f} to the items emitted by the source
53595359
* Observable
53605360
* @see <a href="https://github.com/Netflix/RxJava/wiki/Observable-Utility-Operators#wiki-parallel">RxJava Wiki: parallel()</a>
53615361
*/
@@ -5376,7 +5376,7 @@ public final <R> Observable<R> parallel(Func1<Observable<T>, Observable<R>> f) {
53765376
* returns an {@code Observable<R>}
53775377
* @param s
53785378
* a {@link Scheduler} to perform the work on
5379-
* @return an Observable that emits the results of applying {@link f} to the items emitted by the source
5379+
* @return an Observable that emits the results of applying {@code f} to the items emitted by the source
53805380
* Observable
53815381
* @see <a href="https://github.com/Netflix/RxJava/wiki/Observable-Utility-Operators#wiki-parallel">RxJava Wiki: parallel()</a>
53825382
*/
@@ -5450,7 +5450,7 @@ public final Subject<T, T> call() {
54505450
* @param initialValue
54515451
* the initial value of the underlying {@link BehaviorSubject}
54525452
* @return an Observable that emits {@code initialValue} followed by the results of invoking the selector
5453-
* on a {@ConnectableObservable} that shares a single subscription to the underlying Observable
5453+
* on a {@link ConnectableObservable} that shares a single subscription to the underlying Observable
54545454
*/
54555455
public final <R> Observable<R> publish(Func1<? super Observable<T>, ? extends Observable<R>> selector, final T initialValue) {
54565456
return multicast(new Func0<Subject<T, T>>() {
@@ -6208,7 +6208,7 @@ public final <R> Observable<R> scan(R initialValue, Func2<R, ? super T, R> accum
62086208
* @throws IllegalArgumentException
62096209
* if the source emits more than one item or no items
62106210
* @see <a href="https://github.com/Netflix/RxJava/wiki/Observable-Utility-Operators#wiki-single-and-singleordefault">RxJava Wiki: single()</a>
6211-
* @see MSDN: {@code Observable.singleAsync()}
6211+
* @see "MSDN: Observable.singleAsync()"
62126212
*/
62136213
public final Observable<T> single() {
62146214
return create(OperationSingle.<T> single(this));
@@ -6229,7 +6229,7 @@ public final Observable<T> single() {
62296229
* if the source Observable emits either more than one item that matches the predicate or no
62306230
* items that match the predicate
62316231
* @see <a href="https://github.com/Netflix/RxJava/wiki/Observable-Utility-Operators#wiki-single-and-singleordefault">RxJava Wiki: single()</a>
6232-
* @see MSDN: {@code Observable.singleAsync()}
6232+
* @see "MSDN: Observable.singleAsync()"
62336233
*/
62346234
public final Observable<T> single(Func1<? super T, Boolean> predicate) {
62356235
return filter(predicate).single();
@@ -6249,7 +6249,7 @@ public final Observable<T> single(Func1<? super T, Boolean> predicate) {
62496249
* @throws IllegalArgumentException
62506250
* if the source Observable emits more than one item
62516251
* @see <a href="https://github.com/Netflix/RxJava/wiki/Observable-Utility-Operators#wiki-single-and-singleordefault">RxJava Wiki: single()</a>
6252-
* @see MSDN: {@code Observable.singleOrDefaultAsync()}
6252+
* @see "MSDN: Observable.singleOrDefaultAsync()"
62536253
*/
62546254
public final Observable<T> singleOrDefault(T defaultValue) {
62556255
return create(OperationSingle.<T> singleOrDefault(this, defaultValue));
@@ -6272,7 +6272,7 @@ public final Observable<T> singleOrDefault(T defaultValue) {
62726272
* @throws IllegalArgumentException
62736273
* if the source Observable emits more than one item that matches the predicate
62746274
* @see <a href="https://github.com/Netflix/RxJava/wiki/Observable-Utility-Operators#wiki-single-and-singleordefault">RxJava Wiki: single()</a>
6275-
* @see MSDN: {@code Observable.singleOrDefaultAsync()}
6275+
* @see "MSDN: Observable.singleOrDefaultAsync()"
62766276
*/
62776277
public final Observable<T> singleOrDefault(T defaultValue, Func1<? super T, Boolean> predicate) {
62786278
return filter(predicate).singleOrDefault(defaultValue);
@@ -7140,8 +7140,7 @@ public final Subscription subscribe(Subscriber<? super T> observer, Scheduler sc
71407140
}
71417141

71427142
/**
7143-
* Asynchronously subscribes Observers to this Observable on the specified
7144-
* {@link Scheduler}.
7143+
* Asynchronously subscribes Observers to this Observable on the specified {@link Scheduler}.
71457144
* <p>
71467145
* <img width="640" src="https://raw.github.com/wiki/Netflix/RxJava/images/rx-operators/subscribeOn.png">
71477146
*
@@ -7150,7 +7149,6 @@ public final Subscription subscribe(Subscriber<? super T> observer, Scheduler sc
71507149
* @return the source Observable modified so that its subscriptions happen on the
71517150
* specified {@link Scheduler}
71527151
* @see <a href="https://github.com/Netflix/RxJava/wiki/Observable-Utility-Operators#wiki-subscribeon">RxJava Wiki: subscribeOn()</a>
7153-
* @see #subscribeOn(rx.Scheduler, int)
71547152
*/
71557153
public final Observable<T> subscribeOn(Scheduler scheduler) {
71567154
return nest().lift(new OperatorSubscribeOn<T>(scheduler));
@@ -7354,7 +7352,7 @@ public final Observable<T> take(long time, TimeUnit unit, Scheduler scheduler) {
73547352
* @return an Observable that emits only the very first item emitted by the source Observable, or an empty
73557353
* Observable if the source Observable completes without emitting a single item
73567354
* @see <a href="https://github.com/Netflix/RxJava/wiki/Filtering-Observables#wiki-first">RxJava Wiki: first()</a>
7357-
* @see MSDN: {@code Observable.firstAsync()}
7355+
* @see "MSDN: Observable.firstAsync()"
73587356
* @deprecated use {@code take(1)} directly
73597357
*/
73607358
@Deprecated
@@ -7374,7 +7372,7 @@ public final Observable<T> takeFirst() {
73747372
* the given condition, or that completes without emitting anything if the source Observable
73757373
* completes without emitting a single condition-satisfying item
73767374
* @see <a href="https://github.com/Netflix/RxJava/wiki/Filtering-Observables#wiki-first">RxJava Wiki: first()</a>
7377-
* @see MSDN: {@code Observable.firstAsync()}
7375+
* @see "MSDN: Observable.firstAsync()"
73787376
*/
73797377
public final Observable<T> takeFirst(Func1<? super T, Boolean> predicate) {
73807378
return filter(predicate).take(1);
@@ -7638,7 +7636,7 @@ public final Observable<T> takeWhileWithIndex(final Func2<? super T, ? super Int
76387636
*
76397637
* @param selector
76407638
* selector that will be invoked for items emitted by the source Observable
7641-
* @return a {@link Plan} that produces the projected results, to be fed (with other Plans) to the
7639+
* @return a {@link Plan0} that produces the projected results, to be fed (with other Plans) to the
76427640
* {@link #when} Observer
76437641
* @throws NullPointerException
76447642
* if {@code selector} is null

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818
/**
1919
* Provides a mechanism for receiving push-based notifications.
2020
* <p>
21-
* After an Observer calls an {@link Observable}'s <code>Observable.subscribe</code> method, the {@link Observable} calls the
22-
* Observer's <code>onNext</code> method to provide notifications. A well-behaved {@link Observable} will call an Observer's
23-
* <code>onCompleted</code> closure exactly once or the Observer's <code>onError</code> closure exactly once.
21+
* After an Observer calls an {@link Observable}'s <code>Observable.subscribe</code> method, the
22+
* {@link Observable} calls the Observer's <code>onNext</code> method to provide notifications. A well-behaved
23+
* {@link Observable} will call an Observer's <code>onCompleted</code> closure exactly once or the Observer's
24+
* <code>onError</code> closure exactly once.
2425
* <p>
2526
* For more information see the <a href="https://github.com/Netflix/RxJava/wiki/Observable">RxJava Wiki</a>
2627
*
@@ -38,7 +39,8 @@ public interface Observer<T> {
3839
/**
3940
* Notifies the Observer that the {@link Observable} has experienced an error condition.
4041
* <p>
41-
* If the {@link Observable} calls this closure, it will not thereafter call <code>onNext</code> or <code>onCompleted</code>.
42+
* If the {@link Observable} calls this closure, it will not thereafter call <code>onNext</code> or
43+
* <code>onCompleted</code>.
4244
*
4345
* @param e
4446
*/
@@ -47,11 +49,13 @@ public interface Observer<T> {
4749
/**
4850
* Provides the Observer with new data.
4951
* <p>
50-
* The {@link Observable} calls this closure 1 or more times, unless it calls <code>onError</code> in which case this closure may never be called.
52+
* The {@link Observable} calls this closure 1 or more times, unless it calls <code>onError</code> in which
53+
* case this closure may never be called.
5154
* <p>
52-
* The {@link Observable} will not call this closure again after it calls either <code>onCompleted</code> or <code>onError</code>.
55+
* The {@link Observable} will not call this closure again after it calls either <code>onCompleted</code> or
56+
* <code>onError</code>.
5357
*
54-
* @param args
58+
* @param t
5559
*/
5660
public abstract void onNext(T t);
5761

0 commit comments

Comments
 (0)