From 3e5bf0ea2fbb3dcde30a2e944ecd2024652a5be4 Mon Sep 17 00:00:00 2001
From: Ben Christensen <benjchristensen@netflix.com>
Date: Fri, 19 Apr 2013 09:01:38 -0700
Subject: [PATCH] Rename from Operator* to Operation* to match convention

---
 rxjava-core/src/main/java/rx/Observable.java              | 4 ++--
 .../{OperatorMulticast.java => OperationMulticast.java}   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename rxjava-core/src/main/java/rx/operators/{OperatorMulticast.java => OperationMulticast.java} (95%)

diff --git a/rxjava-core/src/main/java/rx/Observable.java b/rxjava-core/src/main/java/rx/Observable.java
index 3dd29044e1..48a00638a5 100644
--- 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/rxjava-core/src/main/java/rx/operators/OperatorMulticast.java b/rxjava-core/src/main/java/rx/operators/OperationMulticast.java
similarity index 95%
rename from rxjava-core/src/main/java/rx/operators/OperatorMulticast.java
rename to rxjava-core/src/main/java/rx/operators/OperationMulticast.java
index 2ec3ff0d11..a4b780ece3 100644
--- a/rxjava-core/src/main/java/rx/operators/OperatorMulticast.java
+++ b/rxjava-core/src/main/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);