Restored use of Observer in most places

Author: benjchristensen

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

@@ -15,11 +15,11 @@
  */
 package rx.lang.jruby;
 
-import org.jruby.RubyProc;
 import org.jruby.Ruby;
+import org.jruby.RubyProc;
+import org.jruby.javasupport.JavaUtil;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.javasupport.JavaUtil;
 
 import rx.util.functions.Action;
 import rx.util.functions.Action0;

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

@@ -15,11 +15,11 @@
  */
 package rx.lang.jruby;
 
-import org.jruby.RubyProc;
 import org.jruby.Ruby;
+import org.jruby.RubyProc;
+import org.jruby.javasupport.JavaUtil;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.javasupport.JavaUtil;
 
 import rx.util.functions.Func0;
 import rx.util.functions.Func1;

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

@@ -16,13 +16,10 @@
 package rx.android.observables;
 
 import rx.Observable;
-import rx.Observer;
 import rx.operators.OperationObserveFromAndroidComponent;
-
 import android.app.Activity;
 import android.app.Fragment;
 import android.os.Build;
-import android.support.v4.app.FragmentActivity;
 
 
 public final class AndroidObservable {

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

@@ -15,9 +15,9 @@
  */
 package rx.android.schedulers;
 
+import rx.Scheduler;
 import android.os.Handler;
 import android.os.Looper;
-import rx.Scheduler;
 
 /**
  * Schedulers that have Android specific functionality

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

@@ -15,14 +15,13 @@
  */
 package rx.android.schedulers;
 
-import android.os.Handler;
+import java.util.concurrent.TimeUnit;
 
 import rx.Scheduler;
 import rx.Subscription;
 import rx.operators.SafeObservableSubscription;
 import rx.util.functions.Func2;
-
-import java.util.concurrent.TimeUnit;
+import android.os.Handler;
 
 /**
  * Schedules actions to run on an Android Handler thread.

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

@@ -17,7 +17,6 @@
 
 import rx.Observable;
 import rx.Observer;
-import rx.Subscriber;
 import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
 import android.app.Activity;

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

@@ -15,7 +15,7 @@
  */
 package rx.android.observables;
 
-import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.*;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -29,12 +29,9 @@
 import rx.Observable;
 import rx.Observer;
 import rx.observers.TestObserver;
-import rx.operators.OperationObserveFromAndroidComponent;
 import android.app.Activity;
 import android.app.Fragment;
-import android.os.Build;
 import android.support.v4.app.FragmentActivity;
-import rx.android.observables.AndroidObservable;
 
 
 @RunWith(RobolectricTestRunner.class)

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

@@ -40,7 +40,6 @@
 import rx.Observable;
 import rx.Observable.OnSubscribeFunc;
 import rx.Observer;
-import rx.Subscriber;
 import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.observers.TestObserver;

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

@@ -25,7 +25,6 @@
 import rx.Observable;
 import rx.Observable.OnSubscribeFunc;
 import rx.Observer;
-import rx.Subscriber;
 import rx.Subscription;
 import rx.apache.http.consumers.ResponseConsumerDelegate;
 import rx.subscriptions.CompositeSubscription;

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

@@ -29,7 +29,6 @@
 import rx.Observable;
 import rx.Observable.OnSubscribeFunc;
 import rx.Observer;
-import rx.Subscriber;
 import rx.Subscription;
 import rx.apache.http.ObservableHttpResponse;
 import rx.subscriptions.CompositeSubscription;