Skip to content

Commit f67f97c

Browse files
committed
javadocs: add @SInCE annotations to new methods; fix formatting, polish wording for new Subscriber constructor
1 parent 5e0dbed commit f67f97c

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

src/main/java/rx/Observable.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4538,6 +4538,7 @@ public final <R> Observable<R> flatMap(Func1<? super T, ? extends Observable<? e
45384538
* by the source Observable and merging the results of the Observables obtained from this
45394539
* transformation
45404540
* @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
4541+
* @since 1.0.6
45414542
*/
45424543
@Beta
45434544
public final <R> Observable<R> flatMap(Func1<? super T, ? extends Observable<? extends R>> func, int maxConcurrent) {

src/main/java/rx/Subscriber.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,18 @@ protected Subscriber() {
4646
protected Subscriber(Subscriber<?> op) {
4747
this(op, true);
4848
}
49+
4950
/**
50-
* Construct a subscriber by using the other subscriber for backpressure
51-
* and optionally sharing the underlying subscriptions list.
52-
* <p>To retain the chaining of subscribers, the caller should add the
53-
* created instance to the op via {@code add()}.
51+
* Construct a Subscriber by using another Subscriber for backpressure and optionally sharing the
52+
* underlying subscriptions list.
53+
* <p>
54+
* To retain the chaining of subscribers, add the created instance to {@code op} via {@link #add}.
5455
*
55-
* @param op the other subscriber
56-
* @param shareSubscriptions should the subscription list in op shared with this instance?
56+
* @param op
57+
* the other Subscriber
58+
* @param shareSubscriptions
59+
* {@code true} to share the subscription list in {@code op} with this instance
60+
* @since 1.0.6
5761
*/
5862
protected Subscriber(Subscriber<?> op, boolean shareSubscriptions) {
5963
this.op = op;

0 commit comments

Comments
 (0)