Skip to content

Commit a270165

Browse files
committed
Javadoc changes to help fix #1322
1 parent b76f507 commit a270165

File tree

5 files changed

+14
-12
lines changed

5 files changed

+14
-12
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4831,10 +4831,12 @@ public final Observable<T> mergeWith(Observable<? extends T> t1) {
48314831
* Returns an Observable that emits items produced by multicasting the source Observable within a selector
48324832
* function.
48334833
* <p>
4834+
* This is largely a helper function used by RxJava for other forms of multicasting, such as
4835+
* {@link #publish} and {@link #publishLast}.
4836+
* <p>
48344837
* {@code multicast} does not operate by default on a particular {@link Scheduler}.
48354838
*
48364839
* @warn javadocs incomplete; description needs improvement
4837-
* @warn javadocs incomplete; marble diagram missing
48384840
* @param subjectFactory
48394841
* the {@link Subject} factory
48404842
* @warn javadocs incomplete; "subjectFactory" parameter described poorly
@@ -7772,9 +7774,6 @@ public final BlockingObservable<T> toBlocking() {
77727774
* function once, passing it the entire list, by calling the Observable's {@code toList} method prior to
77737775
* calling its {@link #subscribe} method.
77747776
* <p>
7775-
*
7776-
* <!-- IS THE FOLLOWING NOTE STILL VALID? -->
7777-
*
77787777
* Be careful not to use this operator on Observables that emit infinite or very large numbers of items, as
77797778
* you do not have the option to unsubscribe.
77807779
* <p>

rxjava-core/src/main/java/rx/observers/Observers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import rx.functions.Action1;
2222

2323
/**
24-
* @warn javadoc class description missing
24+
* Helper methods and utilities for creating and working with {@link Observer} objects.
2525
*/
2626
public class Observers {
2727

rxjava-core/src/main/java/rx/observers/Subscribers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import rx.functions.Action1;
2323

2424
/**
25-
* @warn javadoc class description missing
25+
* Helper methods and utilities for creating and working with {@link Subscriber} objects.
2626
*/
2727
public final class Subscribers {
2828
private Subscribers() {

rxjava-core/src/main/java/rx/subjects/Subject.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import rx.Observer;
2020

2121
/**
22-
* @warn javadoc class description missing
22+
* Represents an object that is both an Observable and an Observer.
2323
*/
2424
public abstract class Subject<T, R> extends Observable<R> implements Observer<T> {
2525
protected Subject(OnSubscribe<R> onSubscribe) {

rxjava-core/src/main/java/rx/subscriptions/MultipleAssignmentSubscription.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,11 @@ public void unsubscribe() {
7272
}
7373

7474
/**
75-
* @warn javadoc missing
76-
* @param s
77-
* @throws IllegalArgumentException
75+
* Sets the underlying subscription. If the {@code MultipleAssignmentSubscription} is already unsubscribed,
76+
* setting a new subscription causes the new subscription to also be immediately unsubscribed.
77+
*
78+
* @param s the {@link Subscription} to set
79+
* @throws IllegalArgumentException if {@code s} is {@code null}
7880
*/
7981
public void set(Subscription s) {
8082
if (s == null) {
@@ -94,8 +96,9 @@ public void set(Subscription s) {
9496
}
9597

9698
/**
97-
* @warn javadoc missing
98-
* @return
99+
* Gets the underlying subscription.
100+
*
101+
* @return the {@link Subscription} that underlies the {@code MultipleAssignmentSubscription}
99102
*/
100103
public Subscription get() {
101104
return state.subscription;

0 commit comments

Comments
 (0)