Skip to content

Commit b58bc45

Browse files
committed
Fixed a couple of warnings and reverted change to imports
1 parent 10da2ae commit b58bc45

File tree

1 file changed

+57
-6
lines changed

1 file changed

+57
-6
lines changed

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

Lines changed: 57 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,62 @@
2828
import rx.observables.BlockingObservable;
2929
import rx.observables.ConnectableObservable;
3030
import rx.observables.GroupedObservable;
31-
import rx.operators.*;
31+
import rx.operators.OperationAll;
32+
import rx.operators.OperationAny;
33+
import rx.operators.OperationAverage;
34+
import rx.operators.OperationBuffer;
35+
import rx.operators.OperationCache;
36+
import rx.operators.OperationCast;
37+
import rx.operators.OperationCombineLatest;
38+
import rx.operators.OperationConcat;
39+
import rx.operators.OperationDebounce;
40+
import rx.operators.OperationDefaultIfEmpty;
41+
import rx.operators.OperationDefer;
42+
import rx.operators.OperationDematerialize;
43+
import rx.operators.OperationDistinct;
44+
import rx.operators.OperationDistinctUntilChanged;
45+
import rx.operators.OperationElementAt;
46+
import rx.operators.OperationFilter;
47+
import rx.operators.OperationFinally;
48+
import rx.operators.OperationFirstOrDefault;
49+
import rx.operators.OperationGroupBy;
50+
import rx.operators.OperationInterval;
51+
import rx.operators.OperationMap;
52+
import rx.operators.OperationMaterialize;
53+
import rx.operators.OperationMerge;
54+
import rx.operators.OperationMergeDelayError;
55+
import rx.operators.OperationMulticast;
56+
import rx.operators.OperationObserveOn;
57+
import rx.operators.OperationOnErrorResumeNextViaFunction;
58+
import rx.operators.OperationOnErrorResumeNextViaObservable;
59+
import rx.operators.OperationOnErrorReturn;
60+
import rx.operators.OperationOnExceptionResumeNextViaObservable;
61+
import rx.operators.OperationParallel;
62+
import rx.operators.OperationRetry;
63+
import rx.operators.OperationSample;
64+
import rx.operators.OperationScan;
65+
import rx.operators.OperationSkip;
66+
import rx.operators.OperationSkipLast;
67+
import rx.operators.OperationSkipWhile;
68+
import rx.operators.OperationSubscribeOn;
69+
import rx.operators.OperationSum;
70+
import rx.operators.OperationSwitch;
71+
import rx.operators.OperationSynchronize;
72+
import rx.operators.OperationTake;
73+
import rx.operators.OperationTakeLast;
74+
import rx.operators.OperationTakeUntil;
75+
import rx.operators.OperationTakeWhile;
76+
import rx.operators.OperationThrottleFirst;
77+
import rx.operators.OperationTimeout;
78+
import rx.operators.OperationTimestamp;
79+
import rx.operators.OperationToObservableFuture;
80+
import rx.operators.OperationToObservableIterable;
81+
import rx.operators.OperationToObservableList;
82+
import rx.operators.OperationToObservableSortedList;
83+
import rx.operators.OperationWindow;
84+
import rx.operators.OperationZip;
85+
import rx.operators.SafeObservableSubscription;
86+
import rx.operators.SafeObserver;
3287
import rx.plugins.RxJavaErrorHandler;
3388
import rx.plugins.RxJavaObservableExecutionHook;
3489
import rx.plugins.RxJavaPlugins;
@@ -1801,8 +1856,6 @@ public static <T> Observable<T> switchOnNext(Observable<? extends Observable<? e
18011856
* its {@link Observer}s; it invokes {@code onCompleted} or {@code onError} only once; and it never invokes {@code onNext} after invoking either {@code onCompleted} or {@code onError}.
18021857
* {@code synchronize} enforces this, and the Observable it returns invokes {@code onNext} and {@code onCompleted} or {@code onError} synchronously.
18031858
*
1804-
* @param <T>
1805-
* the type of item emitted by the source Observable
18061859
* @return an Observable that is a chronologically well-behaved version of the source
18071860
* Observable, and that synchronously notifies its {@link Observer}s
18081861
*/
@@ -1822,8 +1875,6 @@ public Observable<T> synchronize() {
18221875
*
18231876
* @param lock
18241877
* The lock object to synchronize each observer call on
1825-
* @param <T>
1826-
* the type of item emitted by the source Observable
18271878
* @return an Observable that is a chronologically well-behaved version of the source
18281879
* Observable, and that synchronously notifies its {@link Observer}s
18291880
*/
@@ -3140,7 +3191,7 @@ public Observable<Boolean> exists(Func1<? super T, Boolean> predicate) {
31403191
/**
31413192
* Determines whether an observable sequence contains a specified element.
31423193
*
3143-
* @param value
3194+
* @param element
31443195
* The element to search in the sequence.
31453196
* @return an Observable that emits if the element is in the source sequence.
31463197
* @see <a href="http://msdn.microsoft.com/en-us/library/hh228965(v=vs.103).aspx">MSDN: Observable.Contains</a>

0 commit comments

Comments
 (0)