Make rxjava-core typesafe

Conflicts:
	rxjava-core/src/main/java/rx/Observable.java
	rxjava-core/src/main/java/rx/observables/BlockingObservable.java
	rxjava-core/src/main/java/rx/subjects/PublishSubject.java

Author: mattrjacobs

rxjava-contrib/rxjava-swing/src/main/java/rx/observables/SwingObservable.java

@@ -15,8 +15,6 @@
  */
 package rx.observables;
 
-import static rx.Observable.filter;
-
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;

rxjava-contrib/rxjava-swing/src/main/java/rx/swing/sources/AbstractButtonSource.java

@@ -69,7 +69,7 @@ public void testObservingActionEvents() {
             @SuppressWarnings("unchecked")
             Action1<ActionEvent> action = mock(Action1.class);
             @SuppressWarnings("unchecked")
-            Action1<Exception> error = mock(Action1.class);
+            Action1<Throwable> error = mock(Action1.class);
             Action0 complete = mock(Action0.class);
 
             final ActionEvent event = new ActionEvent(this, 1, "command");
@@ -85,7 +85,7 @@ void testAction() {
             Subscription sub = fromActionOf(button).subscribe(action, error, complete);
 
             verify(action, never()).call(Matchers.<ActionEvent>any());
-            verify(error, never()).call(Matchers.<Exception>any());
+            verify(error, never()).call(Matchers.<Throwable>any());
             verify(complete, never()).call();
 
             button.testAction();
@@ -97,7 +97,7 @@ void testAction() {
             sub.unsubscribe();
             button.testAction();
             verify(action, times(2)).call(Matchers.<ActionEvent>any());
-            verify(error, never()).call(Matchers.<Exception>any());
+            verify(error, never()).call(Matchers.<Throwable>any());
             verify(complete, never()).call();
         }
     }

rxjava-contrib/rxjava-swing/src/main/java/rx/swing/sources/KeyEventSource.java

@@ -113,15 +113,15 @@ public void testObservingKeyEvents() {
             @SuppressWarnings("unchecked")
             Action1<KeyEvent> action = mock(Action1.class);
             @SuppressWarnings("unchecked")
-            Action1<Exception> error = mock(Action1.class);
+            Action1<Throwable> error = mock(Action1.class);
             Action0 complete = mock(Action0.class);
 
             final KeyEvent event = mock(KeyEvent.class);
 
             Subscription sub = fromKeyEventsOf(comp).subscribe(action, error, complete);
 
             verify(action, never()).call(Matchers.<KeyEvent>any());
-            verify(error, never()).call(Matchers.<Exception>any());
+            verify(error, never()).call(Matchers.<Throwable>any());
             verify(complete, never()).call();
 
             fireKeyEvent(event);
@@ -133,7 +133,7 @@ public void testObservingKeyEvents() {
             sub.unsubscribe();
             fireKeyEvent(event);
             verify(action, times(2)).call(Matchers.<KeyEvent>any());
-            verify(error, never()).call(Matchers.<Exception>any());
+            verify(error, never()).call(Matchers.<Throwable>any());
             verify(complete, never()).call();
         }
 
@@ -142,19 +142,19 @@ public void testObservingPressedKeys() {
             @SuppressWarnings("unchecked")
             Action1<Set<Integer>> action = mock(Action1.class);
             @SuppressWarnings("unchecked")
-            Action1<Exception> error = mock(Action1.class);
+            Action1<Throwable> error = mock(Action1.class);
             Action0 complete = mock(Action0.class);
 
             Subscription sub = currentlyPressedKeysOf(comp).subscribe(action, error, complete);
 
             InOrder inOrder = inOrder(action);
             inOrder.verify(action, times(1)).call(Collections.<Integer>emptySet());
-            verify(error, never()).call(Matchers.<Exception>any());
+            verify(error, never()).call(Matchers.<Throwable>any());
             verify(complete, never()).call();
 
             fireKeyEvent(keyEvent(1, KeyEvent.KEY_PRESSED));
             inOrder.verify(action, times(1)).call(new HashSet<Integer>(asList(1)));
-            verify(error, never()).call(Matchers.<Exception>any());
+            verify(error, never()).call(Matchers.<Throwable>any());
             verify(complete, never()).call();
 
             fireKeyEvent(keyEvent(2, KeyEvent.KEY_PRESSED));
@@ -173,7 +173,7 @@ public void testObservingPressedKeys() {
 
             fireKeyEvent(keyEvent(1, KeyEvent.KEY_PRESSED));
             inOrder.verify(action, never()).call(Matchers.<Set<Integer>>any());
-            verify(error, never()).call(Matchers.<Exception>any());
+            verify(error, never()).call(Matchers.<Throwable>any());
             verify(complete, never()).call();
         }