Rename from Operator* to Operation* to match convention

ReactiveX · Apr 19, 2013 · 3e5bf0e · 3e5bf0e
1 parent fbb27ac
commit 3e5bf0e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/rxjava-core/src/main/java/rx/Observable.java b/rxjava-core/src/main/java/rx/Observable.java
@@ -50,7 +50,7 @@
 import rx.operators.OperationMerge;
 import rx.operators.OperationMergeDelayError;
 import rx.operators.OperationMostRecent;
-import rx.operators.OperatorMulticast;
+import rx.operators.OperationMulticast;
 import rx.operators.OperationNext;
 import rx.operators.OperationObserveOn;
 import rx.operators.OperationOnErrorResumeNextViaFunction;
@@ -2096,7 +2096,7 @@ public static <T> Iterable<T> mostRecent(Observable<T> source, T initialValue) {
      * @return a connectable observable sequence that upon connection causes the source sequence to push results into the specified subject.
      */
     public static <T, R> ConnectableObservable<R> multicast(Observable<T> source, final Subject<T, R> subject) {
-        return OperatorMulticast.multicast(source, subject);
+        return OperationMulticast.multicast(source, subject);
     }
 
     /**

diff --git a/.../java/rx/operators/OperatorMulticast.java → ...java/rx/operators/OperationMulticast.java b/.../java/rx/operators/OperatorMulticast.java → ...java/rx/operators/OperationMulticast.java
@@ -26,7 +26,7 @@
 
 import static org.mockito.Mockito.*;
 
-public class OperatorMulticast {
+public class OperationMulticast {
     public static <T, R> ConnectableObservable<R> multicast(Observable<T> source, final Subject<T, R> subject) {
         return new MulticastConnectableObservable<T, R>(source, subject);
     }
@@ -95,7 +95,7 @@ public static class UnitTest {
         public void testMulticast() {
             TestObservable source = new TestObservable();
 
-            ConnectableObservable<String> multicasted = OperatorMulticast.multicast(source,
+            ConnectableObservable<String> multicasted = OperationMulticast.multicast(source,
                     PublishSubject.<String>create());
 
             Observer<String> observer = mock(Observer.class);
@@ -122,7 +122,7 @@ public void testMulticast() {
         public void testMulticastConnectTwice() {
             TestObservable source = new TestObservable();
 
-            ConnectableObservable<String> multicasted = OperatorMulticast.multicast(source,
+            ConnectableObservable<String> multicasted = OperationMulticast.multicast(source,
                     PublishSubject.<String>create());
 
             Observer<String> observer = mock(Observer.class);
@@ -146,7 +146,7 @@ public void testMulticastConnectTwice() {
         public void testMulticastDisconnect() {
             TestObservable source = new TestObservable();
 
-            ConnectableObservable<String> multicasted = OperatorMulticast.multicast(source,
+            ConnectableObservable<String> multicasted = OperationMulticast.multicast(source,
                     PublishSubject.<String>create());
 
             Observer<String> observer = mock(Observer.class);