Skip to content

Commit 99f32ab

Browse files
benjchristensenbenjchristensen
committed
Restored use of Observer in most places
1 parent cac2118 commit 99f32ab

114 files changed

Lines changed: 578 additions & 397 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎language-adaptors/rxjava-jruby/src/main/java/rx/lang/jruby/JRubyActionWrapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*/
1616
package rx.lang.jruby;
1717

18-
import org.jruby.RubyProc;
1918
import org.jruby.Ruby;
19+
import org.jruby.RubyProc;
20+
import org.jruby.javasupport.JavaUtil;
2021
import org.jruby.runtime.ThreadContext;
2122
import org.jruby.runtime.builtin.IRubyObject;
22-
import org.jruby.javasupport.JavaUtil;
2323

2424
import rx.util.functions.Action;
2525
import rx.util.functions.Action0;

‎language-adaptors/rxjava-jruby/src/main/java/rx/lang/jruby/JRubyFunctionWrapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*/
1616
package rx.lang.jruby;
1717

18-
import org.jruby.RubyProc;
1918
import org.jruby.Ruby;
19+
import org.jruby.RubyProc;
20+
import org.jruby.javasupport.JavaUtil;
2021
import org.jruby.runtime.ThreadContext;
2122
import org.jruby.runtime.builtin.IRubyObject;
22-
import org.jruby.javasupport.JavaUtil;
2323

2424
import rx.util.functions.Func0;
2525
import rx.util.functions.Func1;

‎rxjava-contrib/rxjava-android/src/main/java/rx/android/observables/AndroidObservable.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,10 @@
1616
package rx.android.observables;
1717

1818
import rx.Observable;
19-
import rx.Observer;
2019
import rx.operators.OperationObserveFromAndroidComponent;
21-
2220
import android.app.Activity;
2321
import android.app.Fragment;
2422
import android.os.Build;
25-
import android.support.v4.app.FragmentActivity;
2623

2724

2825
public final class AndroidObservable {

‎rxjava-contrib/rxjava-android/src/main/java/rx/android/schedulers/AndroidSchedulers.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*/
1616
package rx.android.schedulers;
1717

18+
import rx.Scheduler;
1819
import android.os.Handler;
1920
import android.os.Looper;
20-
import rx.Scheduler;
2121

2222
/**
2323
* Schedulers that have Android specific functionality

‎rxjava-contrib/rxjava-android/src/main/java/rx/android/schedulers/HandlerThreadScheduler.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@
1515
*/
1616
package rx.android.schedulers;
1717

18-
import android.os.Handler;
18+
import java.util.concurrent.TimeUnit;
1919

2020
import rx.Scheduler;
2121
import rx.Subscription;
2222
import rx.operators.SafeObservableSubscription;
2323
import rx.util.functions.Func2;
24-
25-
import java.util.concurrent.TimeUnit;
24+
import android.os.Handler;
2625

2726
/**
2827
* Schedules actions to run on an Android Handler thread.

‎rxjava-contrib/rxjava-android/src/main/java/rx/operators/OperationObserveFromAndroidComponent.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import rx.Observable;
1919
import rx.Observer;
20-
import rx.Subscriber;
2120
import rx.Subscription;
2221
import rx.android.schedulers.AndroidSchedulers;
2322
import android.app.Activity;

‎rxjava-contrib/rxjava-android/src/test/java/rx/android/observables/AndroidObservableTest.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package rx.android.observables;
1717

18-
import static org.mockito.Mockito.verify;
18+
import static org.mockito.Mockito.*;
1919

2020
import org.junit.Before;
2121
import org.junit.Test;
@@ -29,12 +29,9 @@
2929
import rx.Observable;
3030
import rx.Observer;
3131
import rx.observers.TestObserver;
32-
import rx.operators.OperationObserveFromAndroidComponent;
3332
import android.app.Activity;
3433
import android.app.Fragment;
35-
import android.os.Build;
3634
import android.support.v4.app.FragmentActivity;
37-
import rx.android.observables.AndroidObservable;
3835

3936

4037
@RunWith(RobolectricTestRunner.class)

‎rxjava-contrib/rxjava-android/src/test/java/rx/android/operators/OperationObserveFromAndroidComponentTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import rx.Observable;
4141
import rx.Observable.OnSubscribeFunc;
4242
import rx.Observer;
43-
import rx.Subscriber;
4443
import rx.Subscription;
4544
import rx.android.schedulers.AndroidSchedulers;
4645
import rx.observers.TestObserver;

‎rxjava-contrib/rxjava-apache-http/src/main/java/rx/apache/http/ObservableHttp.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import rx.Observable;
2626
import rx.Observable.OnSubscribeFunc;
2727
import rx.Observer;
28-
import rx.Subscriber;
2928
import rx.Subscription;
3029
import rx.apache.http.consumers.ResponseConsumerDelegate;
3130
import rx.subscriptions.CompositeSubscription;

‎rxjava-contrib/rxjava-apache-http/src/main/java/rx/apache/http/consumers/ResponseConsumerBasic.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import rx.Observable;
3030
import rx.Observable.OnSubscribeFunc;
3131
import rx.Observer;
32-
import rx.Subscriber;
3332
import rx.Subscription;
3433
import rx.apache.http.ObservableHttpResponse;
3534
import rx.subscriptions.CompositeSubscription;

0 commit comments

Comments
 (0)