Skip to content

Commit 0632443

Browse files
Rename from Operator* to Operation* to match convention
1 parent eec8558 commit 0632443

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import rx.operators.OperationMerge;
5151
import rx.operators.OperationMergeDelayError;
5252
import rx.operators.OperationMostRecent;
53-
import rx.operators.OperatorMulticast;
53+
import rx.operators.OperationMulticast;
5454
import rx.operators.OperationNext;
5555
import rx.operators.OperationObserveOn;
5656
import rx.operators.OperationOnErrorResumeNextViaFunction;
@@ -2096,7 +2096,7 @@ public static <T> Iterable<T> mostRecent(Observable<T> source, T initialValue) {
20962096
* @return a connectable observable sequence that upon connection causes the source sequence to push results into the specified subject.
20972097
*/
20982098
public static <T, R> ConnectableObservable<R> multicast(Observable<T> source, final Subject<T, R> subject) {
2099-
return OperatorMulticast.multicast(source, subject);
2099+
return OperationMulticast.multicast(source, subject);
21002100
}
21012101

21022102
/**

rxjava-core/src/main/java/rx/operators/OperatorMulticast.java renamed to rxjava-core/src/main/java/rx/operators/OperationMulticast.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
import static org.mockito.Mockito.*;
2828

29-
public class OperatorMulticast {
29+
public class OperationMulticast {
3030
public static <T, R> ConnectableObservable<R> multicast(Observable<T> source, final Subject<T, R> subject) {
3131
return new MulticastConnectableObservable<T, R>(source, subject);
3232
}
@@ -95,7 +95,7 @@ public static class UnitTest {
9595
public void testMulticast() {
9696
TestObservable source = new TestObservable();
9797

98-
ConnectableObservable<String> multicasted = OperatorMulticast.multicast(source,
98+
ConnectableObservable<String> multicasted = OperationMulticast.multicast(source,
9999
PublishSubject.<String>create());
100100

101101
Observer<String> observer = mock(Observer.class);
@@ -122,7 +122,7 @@ public void testMulticast() {
122122
public void testMulticastConnectTwice() {
123123
TestObservable source = new TestObservable();
124124

125-
ConnectableObservable<String> multicasted = OperatorMulticast.multicast(source,
125+
ConnectableObservable<String> multicasted = OperationMulticast.multicast(source,
126126
PublishSubject.<String>create());
127127

128128
Observer<String> observer = mock(Observer.class);
@@ -146,7 +146,7 @@ public void testMulticastConnectTwice() {
146146
public void testMulticastDisconnect() {
147147
TestObservable source = new TestObservable();
148148

149-
ConnectableObservable<String> multicasted = OperatorMulticast.multicast(source,
149+
ConnectableObservable<String> multicasted = OperationMulticast.multicast(source,
150150
PublishSubject.<String>create());
151151

152152
Observer<String> observer = mock(Observer.class);

0 commit comments

Comments
 (0)