Skip to content

Commit 723d935

Browse files
Bind implementation of Merge
- it’s working … but I can’t figure out the co/contra-variance for the generics! anyone have ideas?
1 parent b5e4933 commit 723d935

File tree

8 files changed

+256
-316
lines changed

8 files changed

+256
-316
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
import rx.operators.OperationJoinPatterns;
6363
import rx.operators.OperatorMap;
6464
import rx.operators.OperationMaterialize;
65-
import rx.operators.OperationMerge;
65+
import rx.operators.OperatorMerge;
6666
import rx.operators.OperationMergeDelayError;
6767
import rx.operators.OperationMinMax;
6868
import rx.operators.OperationMulticast;
@@ -1902,7 +1902,7 @@ public final static <T> Observable<T> merge(Iterable<? extends Observable<? exte
19021902
* @see <a href="http://msdn.microsoft.com/en-us/library/hh229099.aspx">MSDN: Observable.Merge</a>
19031903
*/
19041904
public final static <T> Observable<T> merge(Observable<? extends Observable<? extends T>> source) {
1905-
return create(OperationMerge.merge(source));
1905+
return source.bind(new OperatorMerge()); // any idea how to get these generics working?!
19061906
}
19071907

19081908
/**
@@ -1926,7 +1926,7 @@ public final static <T> Observable<T> merge(Observable<? extends Observable<? ex
19261926
* @see <a href="http://msdn.microsoft.com/en-us/library/hh211914.aspx">MSDN: Observable.Merge</a>
19271927
*/
19281928
public final static <T> Observable<T> merge(Observable<? extends Observable<? extends T>> source, int maxConcurrent) {
1929-
return create(OperationMerge.merge(source, maxConcurrent));
1929+
return source.bind(new OperatorMerge(maxConcurrent)); // any idea how to get these generics working?!
19301930
}
19311931

19321932
/**

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

Lines changed: 0 additions & 230 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import rx.util.CompositeException;
2929

3030
/**
31-
* This behaves like {@link OperationMerge} except that if any of the merged Observables notify of
31+
* This behaves like {@link OperatorMerge} except that if any of the merged Observables notify of
3232
* an error via <code>onError</code>, mergeDelayError will refrain from propagating that error
3333
* notification until all of the merged Observables have finished emitting items.
3434
* <p>

0 commit comments

Comments
 (0)