Skip to content

Commit 5f4efbf

Browse files
Merge pull request #1294 from benjchristensen/rx-internal-operators
rx.operators -> rx.internal.operators
2 parents d3a2f68 + 7530361 commit 5f4efbf

File tree

206 files changed

+230
-219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+230
-219
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
import rx.exceptions.*;
2121
import rx.functions.*;
22+
import rx.internal.operators.*;
2223
import rx.observables.*;
2324
import rx.observers.SafeSubscriber;
24-
import rx.operators.*;
2525
import rx.plugins.*;
2626
import rx.schedulers.*;
2727
import rx.subjects.*;

rxjava-core/src/main/java/rx/operators/BlockingOperatorLatest.java renamed to rxjava-core/src/main/java/rx/internal/operators/BlockingOperatorLatest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package rx.operators;
16+
package rx.internal.operators;
1717

1818
import java.util.Iterator;
1919
import java.util.NoSuchElementException;

rxjava-core/src/main/java/rx/operators/BlockingOperatorMostRecent.java renamed to rxjava-core/src/main/java/rx/internal/operators/BlockingOperatorMostRecent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package rx.operators;
16+
package rx.internal.operators;
1717

1818
import java.util.Iterator;
1919

rxjava-core/src/main/java/rx/operators/BlockingOperatorNext.java renamed to rxjava-core/src/main/java/rx/internal/operators/BlockingOperatorNext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package rx.operators;
16+
package rx.internal.operators;
1717

1818
import java.util.Iterator;
1919
import java.util.NoSuchElementException;

rxjava-core/src/main/java/rx/operators/BlockingOperatorToFuture.java renamed to rxjava-core/src/main/java/rx/internal/operators/BlockingOperatorToFuture.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package rx.operators;
16+
package rx.internal.operators;
1717

1818
import java.util.concurrent.CancellationException;
1919
import java.util.concurrent.CountDownLatch;

rxjava-core/src/main/java/rx/operators/BlockingOperatorToIterator.java renamed to rxjava-core/src/main/java/rx/internal/operators/BlockingOperatorToIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package rx.operators;
16+
package rx.internal.operators;
1717

1818
import java.util.Iterator;
1919
import java.util.NoSuchElementException;

rxjava-core/src/main/java/rx/operators/BufferUntilSubscriber.java renamed to rxjava-core/src/main/java/rx/internal/operators/BufferUntilSubscriber.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package rx.operators;
16+
package rx.internal.operators;
1717

1818
import java.util.concurrent.ConcurrentLinkedQueue;
1919
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;

rxjava-core/src/main/java/rx/operators/NotificationLite.java renamed to rxjava-core/src/main/java/rx/internal/operators/NotificationLite.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package rx.operators;
16+
package rx.internal.operators;
1717

1818
import java.io.Serializable;
1919

rxjava-core/src/main/java/rx/operators/OnSubscribeAmb.java renamed to rxjava-core/src/main/java/rx/internal/operators/OnSubscribeAmb.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package rx.operators;
16+
package rx.internal.operators;
1717

1818
import java.util.ArrayList;
1919
import java.util.List;

rxjava-core/src/main/java/rx/operators/OnSubscribeCache.java renamed to rxjava-core/src/main/java/rx/internal/operators/OnSubscribeCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package rx.operators;
16+
package rx.internal.operators;
1717

1818
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
1919

0 commit comments

Comments
 (0)