Several minor enhancements

netopyr · Feb 11, 2017 · b1960d7 · b1960d7
1 parent d338b23
commit b1960d7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/reduxfx-lib/src/main/java/com/netopyr/reduxfx/updater/Update.java b/reduxfx-lib/src/main/java/com/netopyr/reduxfx/updater/Update.java
@@ -16,7 +16,8 @@ public static <T> Update<T> of(T state, Command... commands) {
         return new Update<>(state, Array.of(commands));
     }
 
-    public static <T> Update<T> of(T state, Seq<Command> commands) {
+    @SafeVarargs
+    public static <T> Update<T> of(T state, Seq<Command>... commands) {
         return new Update<>(state, commands);
     }
 

diff --git a/reduxfx-lib/src/main/java/com/netopyr/reduxfx/vscenegraph/builders/CheckBoxBuilder.java b/reduxfx-lib/src/main/java/com/netopyr/reduxfx/vscenegraph/builders/CheckBoxBuilder.java
@@ -3,6 +3,7 @@
 import com.netopyr.reduxfx.vscenegraph.VNode;
 import com.netopyr.reduxfx.vscenegraph.event.VEventHandler;
 import com.netopyr.reduxfx.vscenegraph.event.VEventType;
+import com.netopyr.reduxfx.vscenegraph.property.VChangeListener;
 import com.netopyr.reduxfx.vscenegraph.property.VProperty;
 import javaslang.collection.Array;
 import javaslang.collection.Map;
@@ -34,6 +35,9 @@ protected BUILDER create(
     public BUILDER selected(boolean value) {
         return property(SELECTED, value);
     }
+    public BUILDER selected(VChangeListener<Boolean> changeListener) {
+        return property(SELECTED, changeListener);
+    }
 
 
     @Override

diff --git a/reduxfx-lib/src/main/java/com/netopyr/reduxfx/vscenegraph/builders/StageBuilder.java b/reduxfx-lib/src/main/java/com/netopyr/reduxfx/vscenegraph/builders/StageBuilder.java
@@ -4,9 +4,12 @@
 import com.netopyr.reduxfx.vscenegraph.event.VEventHandler;
 import com.netopyr.reduxfx.vscenegraph.event.VEventType;
 import com.netopyr.reduxfx.vscenegraph.property.VProperty;
+import javafx.stage.WindowEvent;
 import javaslang.collection.Array;
 import javaslang.collection.Map;
 
+import static com.netopyr.reduxfx.vscenegraph.event.VEventType.CLOSE_REQUEST;
+
 public class StageBuilder<BUILDER extends StageBuilder<BUILDER>> extends Builder<BUILDER> {
 
     private static final String SCENE = "scene";
@@ -45,4 +48,9 @@ public BUILDER title(String value) {
         return property(TITLE, value);
     }
 
+
+    public BUILDER onCloseRequest(VEventHandler<WindowEvent> eventHandler) {
+        return onEvent(CLOSE_REQUEST, eventHandler);
+    }
+
 }
diff --git a/reduxfx-lib/src/main/java/com/netopyr/reduxfx/vscenegraph/event/VEventType.java b/reduxfx-lib/src/main/java/com/netopyr/reduxfx/vscenegraph/event/VEventType.java
@@ -2,6 +2,7 @@
 
 public enum VEventType {
     ACTION("action"),
+    CLOSE_REQUEST("closeRequest"),
     MOUSE_CLICKED("mouseClicked");
 
     private final String name;