Implement SceneEvents

Author: thomasnield

src/main/java/rx/javafx/sources/SceneEventSource.java

@@ -0,0 +1,28 @@
+package rx.javafx.sources;
+
+import javafx.event.Event;
+import javafx.event.EventHandler;
+import javafx.event.EventType;
+import javafx.scene.Scene;
+import rx.Observable;
+import rx.Subscriber;
+import rx.schedulers.JavaFxScheduler;
+import rx.subscriptions.JavaFxSubscriptions;
+
+public final class SceneEventSource {
+
+    public static <T extends Event> Observable<T> fromSceneEvents(final Scene source, final EventType<T> eventType) {
+
+        return Observable.create(new Observable.OnSubscribe<T>() {
+            @Override
+            public void call(final Subscriber<? super T> subscriber) {
+                final EventHandler<T> handler = subscriber::onNext;
+
+                source.addEventHandler(eventType, handler);
+
+                subscriber.add(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeEventHandler(eventType, handler)));
+            }
+
+        }).subscribeOn(JavaFxScheduler.getInstance());
+    }
+}

src/main/java/rx/observables/JavaFxObservable.java

@@ -20,18 +20,20 @@
 import javafx.event.Event;
 import javafx.event.EventType;
 import javafx.scene.Node;
+import javafx.scene.Scene;
 import rx.Observable;
 import rx.javafx.sources.Change;
 import rx.javafx.sources.NodeEventSource;
 import rx.javafx.sources.ObservableValueSource;
+import rx.javafx.sources.SceneEventSource;
 
 
 public enum JavaFxObservable {
     ; // no instances
 
 
     /**
-     * Creates an observable corresponding to javafx ui events.
+     * Creates an observable corresponding to javafx Node events.
      *
      * @param node      The target of the UI events.
      * @param eventType The type of the observed UI events
@@ -62,4 +64,14 @@ public static <T> Observable<T> fromObservableValue(final ObservableValue<T> fxO
     public static <T> Observable<Change<T>> fromObservableValueChanges(final ObservableValue<T> fxObservable) {
         return ObservableValueSource.fromObservableValueChanges(fxObservable);
     }
+    /**
+     * Creates an observable corresponding to javafx Scene events.
+     *
+     * @param scene      The target of the UI events.
+     * @param eventType The type of the observed UI events
+     * @return An Observable of UI events, appropriately typed
+     */
+    public static <T extends Event> Observable<T> fromSceneEvents(final Scene scene, final EventType<T> eventType) {
+        return SceneEventSource.fromSceneEvents(scene,eventType);
+    }
 }