Skip to content

Commit fc6ea3a

Browse files
akarnokdakarnokd
committed
Fixed accidental import * expansion.
1 parent e670021 commit fc6ea3a

File tree

1 file changed

+12
-134
lines changed

1 file changed

+12
-134
lines changed

‎src/main/java/rx/Observable.java

Lines changed: 12 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -12,142 +12,20 @@
1212
*/
1313
package rx;
1414

15-
import java.util.ArrayList;
16-
import java.util.Arrays;
17-
import java.util.Collection;
18-
import java.util.Collections;
19-
import java.util.List;
20-
import java.util.Map;
21-
import java.util.NoSuchElementException;
22-
import java.util.concurrent.Future;
23-
import java.util.concurrent.TimeUnit;
24-
25-
import rx.exceptions.Exceptions;
26-
import rx.exceptions.OnErrorNotImplementedException;
27-
import rx.functions.Action0;
28-
import rx.functions.Action1;
29-
import rx.functions.Action2;
30-
import rx.functions.Func0;
31-
import rx.functions.Func1;
32-
import rx.functions.Func2;
33-
import rx.functions.Func3;
34-
import rx.functions.Func4;
35-
import rx.functions.Func5;
36-
import rx.functions.Func6;
37-
import rx.functions.Func7;
38-
import rx.functions.Func8;
39-
import rx.functions.Func9;
40-
import rx.functions.FuncN;
41-
import rx.functions.Functions;
42-
import rx.internal.operators.OnSubscribeAmb;
43-
import rx.internal.operators.OnSubscribeCache;
44-
import rx.internal.operators.OnSubscribeCombineLatest;
45-
import rx.internal.operators.OnSubscribeDefer;
46-
import rx.internal.operators.OnSubscribeDelaySubscription;
47-
import rx.internal.operators.OnSubscribeDelaySubscriptionWithSelector;
48-
import rx.internal.operators.OnSubscribeFromIterable;
49-
import rx.internal.operators.OnSubscribeGroupJoin;
50-
import rx.internal.operators.OnSubscribeJoin;
51-
import rx.internal.operators.OnSubscribeMulticastSelector;
52-
import rx.internal.operators.OnSubscribeRange;
53-
import rx.internal.operators.OnSubscribeRedo;
54-
import rx.internal.operators.OnSubscribeTimerOnce;
55-
import rx.internal.operators.OnSubscribeTimerPeriodically;
56-
import rx.internal.operators.OnSubscribeToObservableFuture;
57-
import rx.internal.operators.OnSubscribeUsing;
58-
import rx.internal.operators.OperatorAll;
59-
import rx.internal.operators.OperatorAny;
60-
import rx.internal.operators.OperatorAsObservable;
61-
import rx.internal.operators.OperatorBufferWithSingleObservable;
62-
import rx.internal.operators.OperatorBufferWithSize;
63-
import rx.internal.operators.OperatorBufferWithStartEndObservable;
64-
import rx.internal.operators.OperatorBufferWithTime;
65-
import rx.internal.operators.OperatorCast;
66-
import rx.internal.operators.OperatorConcat;
67-
import rx.internal.operators.OperatorDebounceWithSelector;
68-
import rx.internal.operators.OperatorDebounceWithTime;
69-
import rx.internal.operators.OperatorDefaultIfEmpty;
70-
import rx.internal.operators.OperatorDelay;
71-
import rx.internal.operators.OperatorDelayWithSelector;
72-
import rx.internal.operators.OperatorDematerialize;
73-
import rx.internal.operators.OperatorDistinct;
74-
import rx.internal.operators.OperatorDistinctUntilChanged;
75-
import rx.internal.operators.OperatorDoOnEach;
76-
import rx.internal.operators.OperatorDoOnSubscribe;
77-
import rx.internal.operators.OperatorDoOnUnsubscribe;
78-
import rx.internal.operators.OperatorElementAt;
79-
import rx.internal.operators.OperatorFilter;
80-
import rx.internal.operators.OperatorFinally;
81-
import rx.internal.operators.OperatorGroupBy;
82-
import rx.internal.operators.OperatorMap;
83-
import rx.internal.operators.OperatorMapNotification;
84-
import rx.internal.operators.OperatorMapPair;
85-
import rx.internal.operators.OperatorMaterialize;
86-
import rx.internal.operators.OperatorMerge;
87-
import rx.internal.operators.OperatorMergeDelayError;
88-
import rx.internal.operators.OperatorMergeMaxConcurrent;
89-
import rx.internal.operators.OperatorMulticast;
90-
import rx.internal.operators.OperatorObserveOn;
91-
import rx.internal.operators.OperatorOnBackpressureBlock;
92-
import rx.internal.operators.OperatorOnBackpressureBuffer;
93-
import rx.internal.operators.OperatorOnBackpressureDrop;
94-
import rx.internal.operators.OperatorOnErrorResumeNextViaFunction;
95-
import rx.internal.operators.OperatorOnErrorResumeNextViaObservable;
96-
import rx.internal.operators.OperatorOnErrorReturn;
97-
import rx.internal.operators.OperatorOnExceptionResumeNextViaObservable;
98-
import rx.internal.operators.OperatorPublish;
99-
import rx.internal.operators.OperatorReplay;
100-
import rx.internal.operators.OperatorRetryWithPredicate;
101-
import rx.internal.operators.OperatorSampleWithObservable;
102-
import rx.internal.operators.OperatorSampleWithTime;
103-
import rx.internal.operators.OperatorScan;
104-
import rx.internal.operators.OperatorSequenceEqual;
105-
import rx.internal.operators.OperatorSerialize;
106-
import rx.internal.operators.OperatorSingle;
107-
import rx.internal.operators.OperatorSkip;
108-
import rx.internal.operators.OperatorSkipLast;
109-
import rx.internal.operators.OperatorSkipLastTimed;
110-
import rx.internal.operators.OperatorSkipTimed;
111-
import rx.internal.operators.OperatorSkipUntil;
112-
import rx.internal.operators.OperatorSkipWhile;
113-
import rx.internal.operators.OperatorSubscribeOn;
114-
import rx.internal.operators.OperatorSwitch;
115-
import rx.internal.operators.OperatorTake;
116-
import rx.internal.operators.OperatorTakeLast;
117-
import rx.internal.operators.OperatorTakeLastTimed;
118-
import rx.internal.operators.OperatorTakeTimed;
119-
import rx.internal.operators.OperatorTakeUntil;
120-
import rx.internal.operators.OperatorTakeWhile;
121-
import rx.internal.operators.OperatorThrottleFirst;
122-
import rx.internal.operators.OperatorTimeInterval;
123-
import rx.internal.operators.OperatorTimeout;
124-
import rx.internal.operators.OperatorTimeoutWithSelector;
125-
import rx.internal.operators.OperatorTimestamp;
126-
import rx.internal.operators.OperatorToMap;
127-
import rx.internal.operators.OperatorToMultimap;
128-
import rx.internal.operators.OperatorToObservableList;
129-
import rx.internal.operators.OperatorToObservableSortedList;
130-
import rx.internal.operators.OperatorUnsubscribeOn;
131-
import rx.internal.operators.OperatorWindowWithObservable;
132-
import rx.internal.operators.OperatorWindowWithSize;
133-
import rx.internal.operators.OperatorWindowWithStartEndObservable;
134-
import rx.internal.operators.OperatorWindowWithTime;
135-
import rx.internal.operators.OperatorZip;
136-
import rx.internal.operators.OperatorZipIterable;
137-
import rx.internal.util.RxRingBuffer;
15+
import java.util.*;
16+
import java.util.concurrent.*;
17+
18+
import rx.exceptions.*;
19+
import rx.functions.*;
20+
import rx.internal.operators.*;
13821
import rx.internal.util.ScalarSynchronousObservable;
13922
import rx.internal.util.UtilityFunctions;
140-
import rx.observables.BlockingObservable;
141-
import rx.observables.ConnectableObservable;
142-
import rx.observables.GroupedObservable;
23+
24+
import rx.observables.*;
14325
import rx.observers.SafeSubscriber;
144-
import rx.plugins.RxJavaObservableExecutionHook;
145-
import rx.plugins.RxJavaPlugins;
146-
import rx.schedulers.Schedulers;
147-
import rx.schedulers.TimeInterval;
148-
import rx.schedulers.Timestamped;
149-
import rx.subjects.ReplaySubject;
150-
import rx.subjects.Subject;
26+
import rx.plugins.*;
27+
import rx.schedulers.*;
28+
import rx.subjects.*;
15129
import rx.subscriptions.Subscriptions;
15230

15331
/**
@@ -5211,7 +5089,7 @@ public final Observable<T> onBackpressureBlock(int maxQueueLength) {
52115089
* @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
52125090
*/
52135091
public final Observable<T> onBackpressureBlock() {
5214-
return onBackpressureBlock(RxRingBuffer.SIZE);
5092+
return onBackpressureBlock(rx.internal.util.RxRingBuffer.SIZE);
52155093
}
52165094

52175095
/**

0 commit comments

Comments
 (0)