Skip to content

Commit 4459417

Browse files
benjchristensenbenjchristensen
committed
collapse imports
attempt to reduce merge conflicts as it's always the import statements that are conflicting
1 parent 4fc1b92 commit 4459417

File tree

1 file changed

+10
-128
lines changed

1 file changed

+10
-128
lines changed

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

Lines changed: 10 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -14,135 +14,17 @@
1414

1515
import static rx.functions.Functions.alwaysFalse;
1616

17-
import java.util.ArrayList;
18-
import java.util.Arrays;
19-
import java.util.Collection;
20-
import java.util.List;
21-
import java.util.Map;
22-
import java.util.NoSuchElementException;
23-
import java.util.concurrent.Future;
24-
import java.util.concurrent.TimeUnit;
25-
26-
import rx.exceptions.Exceptions;
27-
import rx.exceptions.OnErrorNotImplementedException;
28-
import rx.exceptions.OnErrorThrowable;
29-
import rx.functions.Action0;
30-
import rx.functions.Action1;
31-
import rx.functions.Action2;
32-
import rx.functions.Func0;
33-
import rx.functions.Func1;
34-
import rx.functions.Func2;
35-
import rx.functions.Func3;
36-
import rx.functions.Func4;
37-
import rx.functions.Func5;
38-
import rx.functions.Func6;
39-
import rx.functions.Func7;
40-
import rx.functions.Func8;
41-
import rx.functions.Func9;
42-
import rx.functions.FuncN;
43-
import rx.functions.Function;
44-
import rx.functions.Functions;
45-
import rx.observables.BlockingObservable;
46-
import rx.observables.ConnectableObservable;
47-
import rx.observables.GroupedObservable;
17+
import java.util.*;
18+
import java.util.concurrent.*;
19+
20+
import rx.exceptions.*;
21+
import rx.functions.*;
22+
import rx.observables.*;
4823
import rx.observers.SafeSubscriber;
49-
import rx.operators.OnSubscribeFromIterable;
50-
import rx.operators.OnSubscribeRange;
51-
import rx.operators.OperationDelay;
52-
import rx.operators.OperationTakeLast;
53-
import rx.operators.OperationTakeUntil;
54-
import rx.operators.OperationWindow;
55-
import rx.operators.OperatorAll;
56-
import rx.operators.OperatorAmb;
57-
import rx.operators.OperatorAny;
58-
import rx.operators.OperatorAsObservable;
59-
import rx.operators.OperatorBufferWithSingleObservable;
60-
import rx.operators.OperatorBufferWithSize;
61-
import rx.operators.OperatorBufferWithStartEndObservable;
62-
import rx.operators.OperatorBufferWithTime;
63-
import rx.operators.OperatorCache;
64-
import rx.operators.OperatorCast;
65-
import rx.operators.OperatorCombineLatest;
66-
import rx.operators.OperatorConcat;
67-
import rx.operators.OperatorDebounceWithSelector;
68-
import rx.operators.OperatorDebounceWithTime;
69-
import rx.operators.OperatorDefaultIfEmpty;
70-
import rx.operators.OperatorDefer;
71-
import rx.operators.OperatorDematerialize;
72-
import rx.operators.OperatorDistinct;
73-
import rx.operators.OperatorDistinctUntilChanged;
74-
import rx.operators.OperatorDoOnEach;
75-
import rx.operators.OperatorElementAt;
76-
import rx.operators.OperatorFilter;
77-
import rx.operators.OperatorFinally;
78-
import rx.operators.OperatorGroupBy;
79-
import rx.operators.OperatorGroupByUntil;
80-
import rx.operators.OperatorGroupJoin;
81-
import rx.operators.OperatorJoin;
82-
import rx.operators.OperatorMap;
83-
import rx.operators.OperatorMaterialize;
84-
import rx.operators.OperatorMerge;
85-
import rx.operators.OperatorMergeDelayError;
86-
import rx.operators.OperatorMergeMapPair;
87-
import rx.operators.OperatorMergeMapTransform;
88-
import rx.operators.OperatorMergeMaxConcurrent;
89-
import rx.operators.OperatorMulticast;
90-
import rx.operators.OperatorMulticastSelector;
91-
import rx.operators.OperatorObserveOn;
92-
import rx.operators.OperatorOnErrorFlatMap;
93-
import rx.operators.OperatorOnErrorResumeNextViaFunction;
94-
import rx.operators.OperatorOnErrorResumeNextViaObservable;
95-
import rx.operators.OperatorOnErrorReturn;
96-
import rx.operators.OperatorOnExceptionResumeNextViaObservable;
97-
import rx.operators.OperatorParallel;
98-
import rx.operators.OperatorParallelMerge;
99-
import rx.operators.OperatorPivot;
100-
import rx.operators.OperatorRepeat;
101-
import rx.operators.OperatorReplay;
102-
import rx.operators.OperatorRetry;
103-
import rx.operators.OperatorSampleWithObservable;
104-
import rx.operators.OperatorSampleWithTime;
105-
import rx.operators.OperatorScan;
106-
import rx.operators.OperatorSequenceEqual;
107-
import rx.operators.OperatorSerialize;
108-
import rx.operators.OperatorSingle;
109-
import rx.operators.OperatorSkip;
110-
import rx.operators.OperatorSkipLast;
111-
import rx.operators.OperatorSkipLastTimed;
112-
import rx.operators.OperatorSkipTimed;
113-
import rx.operators.OperatorSkipUntil;
114-
import rx.operators.OperatorSkipWhile;
115-
import rx.operators.OperatorSubscribeOn;
116-
import rx.operators.OperatorSwitch;
117-
import rx.operators.OperatorTake;
118-
import rx.operators.OperatorTakeTimed;
119-
import rx.operators.OperatorTakeWhile;
120-
import rx.operators.OperatorThrottleFirst;
121-
import rx.operators.OperatorTimeInterval;
122-
import rx.operators.OperatorTimeout;
123-
import rx.operators.OperatorTimeoutWithSelector;
124-
import rx.operators.OperatorTimerOnce;
125-
import rx.operators.OperatorTimerPeriodically;
126-
import rx.operators.OperatorTimestamp;
127-
import rx.operators.OperatorToMap;
128-
import rx.operators.OperatorToMultimap;
129-
import rx.operators.OperatorToObservableFuture;
130-
import rx.operators.OperatorToObservableList;
131-
import rx.operators.OperatorToObservableSortedList;
132-
import rx.operators.OperatorUnsubscribeOn;
133-
import rx.operators.OperatorUsing;
134-
import rx.operators.OperatorZip;
135-
import rx.operators.OperatorZipIterable;
136-
import rx.plugins.RxJavaObservableExecutionHook;
137-
import rx.plugins.RxJavaPlugins;
138-
import rx.schedulers.Schedulers;
139-
import rx.schedulers.TimeInterval;
140-
import rx.schedulers.Timestamped;
141-
import rx.subjects.AsyncSubject;
142-
import rx.subjects.BehaviorSubject;
143-
import rx.subjects.PublishSubject;
144-
import rx.subjects.ReplaySubject;
145-
import rx.subjects.Subject;
24+
import rx.operators.*;
25+
import rx.plugins.*;
26+
import rx.schedulers.*;
27+
import rx.subjects.*;
14628
import rx.subscriptions.Subscriptions;
14729

14830
/**

0 commit comments

Comments
 (0)