Fixed scheduler javadoc, and one single unnecessary cast in takeWhile

jmhofer · jmhofer · commit 9563a1b6025a · 2013-04-22T15:54:55.000+02:00
diff --git a/rxjava-core/src/main/java/rx/Scheduler.java b/rxjava-core/src/main/java/rx/Scheduler.java
@@ -77,11 +77,16 @@ public abstract class Scheduler {
      * This default implementation schedules recursively and waits for actions to complete (instead of potentially executing
      * long-running actions concurrently). Each scheduler that can do periodic scheduling in a better way should override this.
      *
-     * @param state State to pass into the action.
-     * @param action The action to execute periodically.
-     * @param initialDelay Time to wait before executing the action for the first time.
-     * @param period The time interval to wait each time in between executing the action.
-     * @param unit The time unit the interval above is given in.
+     * @param state 
+     *            State to pass into the action.
+     * @param action 
+     *            The action to execute periodically.
+     * @param initialDelay 
+     *            Time to wait before executing the action for the first time.
+     * @param period 
+     *            The time interval to wait each time in between executing the action.
+     * @param unit 
+     *            The time unit the interval above is given in.
      * @return A subscription to be able to unsubscribe from action.
      */
     public <T> Subscription schedulePeriodically(T state, final Func2<Scheduler, T, Subscription> action, long initialDelay, long period, TimeUnit unit) {
@@ -249,10 +254,14 @@ public Subscription call(@SuppressWarnings("unused") Scheduler scheduler, @Suppr
     /**
      * Schedules a cancelable action to be executed periodically.
      * 
-     * @param action The action to execute periodically.
-     * @param initialDelay Time to wait before executing the action for the first time.
-     * @param period The time interval to wait each time in between executing the action.
-     * @param unit The time unit the interval above is given in.
+     * @param action 
+     *            The action to execute periodically.
+     * @param initialDelay 
+     *            Time to wait before executing the action for the first time.
+     * @param period 
+     *            The time interval to wait each time in between executing the action.
+     * @param unit 
+     *            The time unit the interval above is given in.
      * @return A subscription to be able to unsubscribe from action.
      */
     public Subscription schedulePeriodically(final Func1<Scheduler, Subscription> action, long initialDelay, long period, TimeUnit unit) {
@@ -267,10 +276,14 @@ public Subscription call(Scheduler scheduler, @SuppressWarnings("unused") Void s
     /**
      * Schedules a cancelable action to be executed periodically.
      * 
-     * @param action The action to execute periodically.
-     * @param initialDelay Time to wait before executing the action for the first time.
-     * @param period The time interval to wait each time in between executing the action.
-     * @param unit The time unit the interval above is given in.
+     * @param action 
+     *            The action to execute periodically.
+     * @param initialDelay 
+     *            Time to wait before executing the action for the first time.
+     * @param period 
+     *            The time interval to wait each time in between executing the action.
+     * @param unit 
+     *            The time unit the interval above is given in.
      * @return A subscription to be able to unsubscribe from action.
      */
     public Subscription schedulePeriodically(final Func0<Subscription> action, long initialDelay, long period, TimeUnit unit) {
@@ -285,10 +298,14 @@ public Subscription call(@SuppressWarnings("unused") Scheduler scheduler, @Suppr
     /**
      * Schedules an action to be executed periodically.
      * 
-     * @param action The action to execute periodically.
-     * @param initialDelay Time to wait before executing the action for the first time.
-     * @param period The time interval to wait each time in between executing the action.
-     * @param unit The time unit the interval above is given in.
+     * @param action 
+     *            The action to execute periodically.
+     * @param initialDelay 
+     *            Time to wait before executing the action for the first time.
+     * @param period 
+     *            The time interval to wait each time in between executing the action.
+     * @param unit 
+     *            The time unit the interval above is given in.
      * @return A subscription to be able to unsubscribe from action.
      */
     public Subscription schedulePeriodically(final Action0 action, long initialDelay, long period, TimeUnit unit) {
diff --git a/rxjava-core/src/main/java/rx/operators/OperationTakeWhile.java b/rxjava-core/src/main/java/rx/operators/OperationTakeWhile.java
@@ -27,6 +27,7 @@
 import rx.Observer;
 import rx.Subscription;
 import rx.subjects.PublishSubject;
+import rx.subjects.Subject;
 import rx.subscriptions.Subscriptions;
 import rx.util.AtomicObservableSubscription;
 import rx.util.AtomicObserver;
@@ -174,9 +175,8 @@ public Boolean call(Integer input)
 
         @Test
         public void testTakeWhileOnSubject1() {
-            PublishSubject<Integer> s = PublishSubject.create();
-            Observable<Integer> w = (Observable<Integer>) s;
-            Observable<Integer> take = Observable.create(takeWhile(w, new Func1<Integer, Boolean>()
+            Subject<Integer, Integer> s = PublishSubject.create();
+            Observable<Integer> take = Observable.create(takeWhile(s, new Func1<Integer, Boolean>()
             {
                 @Override
                 public Boolean call(Integer input)
