Skip to content

Commit d960dca

Browse files
Move time based util classes to rx.schedulers
Eliminate dumping ground of rx.util
1 parent 9b61c13 commit d960dca

11 files changed

+12
-12
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,14 @@
116116
import rx.plugins.RxJavaObservableExecutionHook;
117117
import rx.plugins.RxJavaPlugins;
118118
import rx.schedulers.Schedulers;
119+
import rx.schedulers.TimeInterval;
120+
import rx.schedulers.Timestamped;
119121
import rx.subjects.AsyncSubject;
120122
import rx.subjects.BehaviorSubject;
121123
import rx.subjects.PublishSubject;
122124
import rx.subjects.ReplaySubject;
123125
import rx.subjects.Subject;
124126
import rx.subscriptions.Subscriptions;
125-
import rx.util.TimeInterval;
126-
import rx.util.Timestamped;
127127
import rx.util.functions.Action0;
128128
import rx.util.functions.Action1;
129129
import rx.util.functions.Action2;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
import rx.Scheduler;
3333
import rx.Subscriber;
3434
import rx.Subscription;
35+
import rx.schedulers.Timestamped;
3536
import rx.subjects.Subject;
3637
import rx.subscriptions.Subscriptions;
37-
import rx.util.Timestamped;
3838
import rx.util.functions.Action0;
3939
import rx.util.functions.Func1;
4040
import rx.util.functions.Functions;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import rx.Observer;
2929
import rx.Scheduler;
3030
import rx.Subscription;
31-
import rx.util.Timestamped;
31+
import rx.schedulers.Timestamped;
3232

3333
/**
3434
* Bypasses a specified number of elements at the end of an observable sequence.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import rx.Observer;
2626
import rx.Scheduler;
2727
import rx.Subscription;
28-
import rx.util.Timestamped;
28+
import rx.schedulers.Timestamped;
2929

3030
/**
3131
* Returns an Observable that emits the last <code>count</code> items emitted by the source

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import rx.Scheduler;
2222
import rx.Subscription;
2323
import rx.schedulers.Schedulers;
24-
import rx.util.TimeInterval;
24+
import rx.schedulers.TimeInterval;
2525

2626
/**
2727
* Records the time interval between consecutive elements in an observable sequence.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import rx.Observable.Operator;
1919
import rx.Scheduler;
2020
import rx.Subscriber;
21-
import rx.util.Timestamped;
21+
import rx.schedulers.Timestamped;
2222

2323
/**
2424
* Wraps each item emitted by a source Observable in a {@link Timestamped} object.

rxjava-core/src/main/java/rx/util/TimeInterval.java renamed to rxjava-core/src/main/java/rx/schedulers/TimeInterval.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.util;
16+
package rx.schedulers;
1717

1818
public class TimeInterval<T> {
1919
private final long intervalInMilliseconds;

rxjava-core/src/main/java/rx/util/Timestamped.java renamed to rxjava-core/src/main/java/rx/schedulers/Timestamped.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.util;
16+
package rx.schedulers;
1717

1818
/**
1919
* Composite class that takes a value and a timestamp and wraps them.

rxjava-core/src/test/java/rx/operators/OperationTimeIntervalTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import rx.Observable;
2929
import rx.Observer;
3030
import rx.schedulers.TestScheduler;
31+
import rx.schedulers.TimeInterval;
3132
import rx.subjects.PublishSubject;
32-
import rx.util.TimeInterval;
3333

3434
public class OperationTimeIntervalTest {
3535

rxjava-core/src/test/java/rx/operators/OperatorSubscribeOnBoundedTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
import rx.observers.TestObserver;
3838
import rx.observers.TestSubscriber;
3939
import rx.schedulers.Schedulers;
40+
import rx.schedulers.Timestamped;
4041
import rx.subjects.PublishSubject;
4142
import rx.subscriptions.Subscriptions;
42-
import rx.util.Timestamped;
4343
import rx.util.functions.Action0;
4444
import rx.util.functions.Action1;
4545
import rx.util.functions.Func1;

rxjava-core/src/test/java/rx/operators/OperatorTimestampTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import rx.Observable;
3030
import rx.Observer;
3131
import rx.schedulers.TestScheduler;
32+
import rx.schedulers.Timestamped;
3233
import rx.subjects.PublishSubject;
33-
import rx.util.Timestamped;
3434

3535
public class OperatorTimestampTest {
3636
@Mock

0 commit comments

Comments
 (0)