Add OnSubscribeFunction and refactor to support it

This is related to ongoing work related to covariant support at ReactiveX/RxJava#331

Author: benjchristensen

src/main/java/rx/swing/sources/AbstractButtonSource.java

@@ -15,10 +15,7 @@
  */
 package rx.swing.sources;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.*;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -29,20 +26,21 @@
 import org.mockito.Matchers;
 
 import rx.Observable;
+import rx.Observable.OnSubscribeFunc;
 import rx.Observer;
 import rx.Subscription;
+import rx.observables.SwingObservable;
 import rx.subscriptions.Subscriptions;
 import rx.util.functions.Action0;
 import rx.util.functions.Action1;
-import rx.util.functions.Func1;
 
 public enum AbstractButtonSource { ; // no instances
 
     /**
      * @see SwingObservable.fromButtonAction
      */
     public static Observable<ActionEvent> fromActionOf(final AbstractButton button) {
-        return Observable.create(new Func1<Observer<? super ActionEvent>, Subscription>() {
+        return Observable.create(new OnSubscribeFunc<ActionEvent>() {
             @Override
             public Subscription call(final Observer<? super ActionEvent> observer) {
                 final ActionListener listener = new ActionListener() {

src/main/java/rx/swing/sources/ComponentEventSource.java

@@ -15,14 +15,15 @@
  */
 package rx.swing.sources;
 
-import static rx.swing.sources.ComponentEventSource.Predicate.RESIZED;
+import static rx.swing.sources.ComponentEventSource.Predicate.*;
 
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
 
 import rx.Observable;
+import rx.Observable.OnSubscribeFunc;
 import rx.Observer;
 import rx.Subscription;
 import rx.observables.SwingObservable;
@@ -36,7 +37,7 @@ public enum ComponentEventSource { ; // no instances
      * @see SwingObservable.fromComponentEvents
      */
     public static Observable<ComponentEvent> fromComponentEventsOf(final Component component) {
-        return Observable.create(new Func1<Observer<? super ComponentEvent>, Subscription>() {
+        return Observable.create(new OnSubscribeFunc<ComponentEvent>() {
             @Override
             public Subscription call(final Observer<? super ComponentEvent> observer) {
                 final ComponentListener listener = new ComponentListener() {

src/main/java/rx/swing/sources/KeyEventSource.java

@@ -15,12 +15,8 @@
  */
 package rx.swing.sources;
 
-import static java.util.Arrays.asList;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
+import static java.util.Arrays.*;
+import static org.mockito.Mockito.*;
 
 import java.awt.Component;
 import java.awt.event.KeyEvent;
@@ -36,12 +32,12 @@
 import org.mockito.Matchers;
 
 import rx.Observable;
+import rx.Observable.OnSubscribeFunc;
 import rx.Observer;
 import rx.Subscription;
 import rx.subscriptions.Subscriptions;
 import rx.util.functions.Action0;
 import rx.util.functions.Action1;
-import rx.util.functions.Func1;
 import rx.util.functions.Func2;
 
 public enum KeyEventSource { ; // no instances
@@ -50,7 +46,7 @@ public enum KeyEventSource { ; // no instances
      * @see SwingObservable.fromKeyEvents(Component)
      */
     public static Observable<KeyEvent> fromKeyEventsOf(final Component component) {
-        return Observable.create(new Func1<Observer<? super KeyEvent>, Subscription>() {
+        return Observable.create(new OnSubscribeFunc<KeyEvent>() {
             @Override
             public Subscription call(final Observer<? super KeyEvent> observer) {
                 final KeyListener listener = new KeyListener() {

src/main/java/rx/swing/sources/MouseEventSource.java

@@ -21,19 +21,20 @@
 import java.awt.event.MouseMotionListener;
 
 import rx.Observable;
+import rx.Observable.OnSubscribeFunc;
 import rx.Observer;
 import rx.Subscription;
+import rx.observables.SwingObservable;
 import rx.subscriptions.Subscriptions;
 import rx.util.functions.Action0;
-import rx.util.functions.Func1;
 
 public enum MouseEventSource { ; // no instances
 
     /**
      * @see SwingObservable.fromMouseEvents
      */
     public static Observable<MouseEvent> fromMouseEventsOf(final Component component) {
-        return Observable.create(new Func1<Observer<? super MouseEvent>, Subscription>() {
+        return Observable.create(new OnSubscribeFunc<MouseEvent>() {
             @Override
             public Subscription call(final Observer<? super MouseEvent> observer) {
                 final MouseListener listener = new MouseListener() {
@@ -78,7 +79,7 @@ public void call() {
      * @see SwingObservable.fromMouseMotionEvents
      */
     public static Observable<MouseEvent> fromMouseMotionEventsOf(final Component component) {
-        return Observable.create(new Func1<Observer<? super MouseEvent>, Subscription>() {
+        return Observable.create(new OnSubscribeFunc<MouseEvent>() {
             @Override
             public Subscription call(final Observer<? super MouseEvent> observer) {
                 final MouseMotionListener listener = new MouseMotionListener() {