Implement ActionEvents for Node, ContextMenu, and MenuItem

Author: thomasnield

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

@@ -0,0 +1,37 @@
+package rx.javafx.sources;
+
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.scene.Node;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.MenuItem;
+import rx.Observable;
+import rx.schedulers.JavaFxScheduler;
+import rx.subscriptions.JavaFxSubscriptions;
+
+public final class ActionEventSource {
+    private ActionEventSource() {}
+
+    public static Observable<ActionEvent> fromActionEvents(final Node node) {
+        return NodeEventSource.fromNodeEvents(node, ActionEvent.ACTION);
+    }
+    public static Observable<ActionEvent> fromActionEvents(final ContextMenu source) {
+        return Observable.create((Observable.OnSubscribe<ActionEvent>) subscriber -> {
+            final EventHandler<ActionEvent> handler = subscriber::onNext;
+
+            source.addEventHandler(ActionEvent.ANY, handler);
+
+            subscriber.add(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeEventHandler(ActionEvent.ANY, handler)));
+        }).subscribeOn(JavaFxScheduler.getInstance());
+    }
+    public static Observable<ActionEvent> fromActionEvents(final MenuItem source) {
+        return Observable.create((Observable.OnSubscribe<ActionEvent>) subscriber -> {
+            final EventHandler<ActionEvent> handler = subscriber::onNext;
+
+            source.addEventHandler(ActionEvent.ANY, handler);
+
+            subscriber.add(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeEventHandler(ActionEvent.ANY, handler)));
+        }).subscribeOn(JavaFxScheduler.getInstance());
+    }
+
+}

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

@@ -19,21 +19,11 @@ public static <T extends Event> Observable<T> fromNodeEvents(final Node source,
         return Observable.create(new Observable.OnSubscribe<T>() {
             @Override
             public void call(final Subscriber<? super T> subscriber) {
-                final EventHandler<T> handler = new EventHandler<T>() {
-                    @Override
-                    public void handle(T t) {
-                        subscriber.onNext(t);
-                    }
-                };
+                final EventHandler<T> handler = subscriber::onNext;
 
                 source.addEventHandler(eventType, handler);
 
-                subscriber.add(JavaFxSubscriptions.unsubscribeInEventDispatchThread(new Action0() {
-                    @Override
-                    public void call() {
-                        source.removeEventHandler(eventType, handler);
-                    }
-                }));
+                subscriber.add(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeEventHandler(eventType, handler)));
             }
 
         }).subscribeOn(JavaFxScheduler.getInstance());

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

@@ -17,15 +17,15 @@
 
 
 import javafx.beans.value.ObservableValue;
+import javafx.event.ActionEvent;
 import javafx.event.Event;
 import javafx.event.EventType;
 import javafx.scene.Node;
 import javafx.scene.Scene;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.MenuItem;
 import rx.Observable;
-import rx.javafx.sources.Change;
-import rx.javafx.sources.NodeEventSource;
-import rx.javafx.sources.ObservableValueSource;
-import rx.javafx.sources.SceneEventSource;
+import rx.javafx.sources.*;
 
 
 public enum JavaFxObservable {
@@ -74,4 +74,34 @@ public static <T> Observable<Change<T>> fromObservableValueChanges(final Observa
     public static <T extends Event> Observable<T> fromSceneEvents(final Scene scene, final EventType<T> eventType) {
         return SceneEventSource.fromSceneEvents(scene,eventType);
     }
+
+    /**
+     * Creates an observable corresponding to javafx Node action events.
+     *
+     * @param node      The target of the ActionEvents
+     * @return An Observable of UI ActionEvents
+     */
+    public static Observable<ActionEvent> fromActionEvents(final Node node) {
+        return ActionEventSource.fromActionEvents(node);
+    }
+
+    /**
+     * Creates an observable corresponding to javafx ContextMenu action events.
+     *
+     * @param contextMenu      The target of the ActionEvents
+     * @return An Observable of UI ActionEvents
+     */
+    public static Observable<ActionEvent> fromActionEvents(final ContextMenu contextMenu) {
+        return ActionEventSource.fromActionEvents(contextMenu);
+    }
+
+    /**
+     * Creates an observable corresponding to javafx MenuItem action events.
+     *
+     * @param menuItem      The target of the ActionEvents
+     * @return An Observable of UI ActionEvents
+     */
+    public static Observable<ActionEvent> fromActionEvents(final MenuItem menuItem) {
+        return ActionEventSource.fromActionEvents(menuItem);
+    }
 }