simplified dialog usage. improved slider focus onshown

Author: Death111

src/main/java/de/doubleslash/keeptime/view/ChangeWithTimeDialog.java

@@ -8,6 +8,7 @@
 import de.doubleslash.keeptime.common.DateFormatter;
 import de.doubleslash.keeptime.model.Model;
 import de.doubleslash.keeptime.model.Project;
+import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.LongProperty;
 import javafx.geometry.Insets;
@@ -24,16 +25,25 @@ public class ChangeWithTimeDialog {
 
    private static final Logger LOG = LoggerFactory.getLogger(ChangeWithTimeDialog.class);
    private static final String TIME_ZERO = "00:00:00";
-   private static final int BIG_SLIDER_STEP = 5;
+   private static final int FAST_MINUTE_STEPS = 5;
+
+   private final Model model;
+   private final LongProperty activeWorkSecondsProperty;
+   private final Project projectToChangeTo;
 
-   private LongProperty activeWorkSecondsProperty;
-   private Model model;
    private Dialog<Integer> dialog;
    private boolean ctrlIsPressed = false;
 
-   public void setUpDialog(final Project p) {
+   public ChangeWithTimeDialog(final Model model, final LongProperty activeWorkSecondsProperty,
+         final Project projectToChangeTo) {
+      this.model = model;
+      this.activeWorkSecondsProperty = activeWorkSecondsProperty;
+      this.projectToChangeTo = projectToChangeTo;
+
+      setUpDialog();
+   }
 
-      LOG.info("Change with time");
+   private void setUpDialog() {
       dialog = new Dialog<>();
       dialog.setTitle("Change project with time transfer");
       dialog.setHeaderText("Choose the time to transfer");
@@ -55,7 +65,7 @@ public void setUpDialog(final Project p) {
       grid.setPadding(new Insets(20, 150, 10, 10));
       int gridRow = 0;
       grid.add(new Label("Minutes to transfer"), 0, gridRow);
-      final Slider slider = setUpSliderChangeWithTimeMenuItem(activeWorkSecondsProperty);
+      final Slider slider = setupSlider();
 
       grid.add(slider, 1, gridRow);
       final Label minutesToTransferLabel = new Label("999 minute(s)");
@@ -74,7 +84,7 @@ public void setUpDialog(final Project p) {
       grid.add(newEndTimeLabel, 1, gridRow);
       gridRow++;
 
-      grid.add(new Label("New project duration: " + p.getName()), 0, gridRow);
+      grid.add(new Label("New project duration: " + projectToChangeTo.getName()), 0, gridRow);
       final Label newProjectTimeLabel = new Label(TIME_ZERO);
       grid.add(newProjectTimeLabel, 1, gridRow);
 
@@ -94,11 +104,10 @@ public void setUpDialog(final Project p) {
       slider.valueProperty().addListener((obs, oldValue, newValue) -> updateLabelsRunnable.run());
       vBox.getChildren().add(grid);
 
-      // hack to get focus on slider (doesn't work with dialog.setOnShowing(...) or dialog.setOnShown(...))
-      okButton.setOnKeyPressed(keyEvent -> {
-         if ((keyEvent.getCode() == KeyCode.LEFT || keyEvent.getCode() == KeyCode.RIGHT) && !slider.isFocused()) {
-            slider.requestFocus();
-         }
+      dialog.setOnShown(de -> {
+         // workaround to set focus to slider when showing the dialog
+         // onShown is actually called before the dialog is shown
+         Platform.runLater(slider::requestFocus);
       });
 
       dialog.getDialogPane().setContent(vBox);
@@ -112,21 +121,17 @@ public void setUpDialog(final Project p) {
 
    }
 
-   public Optional<Integer> show() {
-
+   /**
+    * Shows the dialog to the user.
+    * 
+    * @return optional with the amount of seconds to transfer to the new project or null if the user does not confirm
+    */
+   public Optional<Integer> showAndWait() {
+      LOG.info("Showing dialog");
       return dialog.showAndWait();
-
-   }
-
-   public void setModel(final Model model) {
-      this.model = model;
-   }
-
-   public void setActiveWorkSecondsProperty(final LongProperty activeWorkSecondsProperty) {
-      this.activeWorkSecondsProperty = activeWorkSecondsProperty;
    }
 
-   private Slider setUpSliderChangeWithTimeMenuItem(final LongProperty activeWorkSecondsProperty) {
+   private Slider setupSlider() {
       final Slider slider = new Slider();
 
       slider.setMin(0);
@@ -139,6 +144,7 @@ private Slider setUpSliderChangeWithTimeMenuItem(final LongProperty activeWorkSe
          slider.setDisable(true);
          return 1l;
       }, activeWorkSecondsProperty));
+
       slider.setValue(0);
       slider.setShowTickLabels(true);
       slider.setShowTickMarks(true);
@@ -150,22 +156,17 @@ private Slider setUpSliderChangeWithTimeMenuItem(final LongProperty activeWorkSe
 
       // allows you to make bigger steps with arrow keys on slider if ctrl is pressed
       slider.setOnKeyPressed(ke -> {
-         if (!slider.isFocused()) {
-            slider.requestFocus();
-         }
-
          if (ke.getCode() == KeyCode.CONTROL) {
             ctrlIsPressed = true;
          }
 
          if (ke.getCode() == KeyCode.LEFT && ctrlIsPressed) {
-            slider.adjustValue(slider.getValue() - BIG_SLIDER_STEP);
+            slider.adjustValue(slider.getValue() - FAST_MINUTE_STEPS);
          }
 
          if (ke.getCode() == KeyCode.RIGHT && ctrlIsPressed) {
-            slider.adjustValue(slider.getValue() + BIG_SLIDER_STEP);
+            slider.adjustValue(slider.getValue() + FAST_MINUTE_STEPS);
          }
-
       });
 
       slider.setOnKeyReleased(ke -> {

src/main/java/de/doubleslash/keeptime/view/ViewController.java

@@ -554,13 +554,10 @@ private Node addProjectToProjectList(final Project p) {
 
       final MenuItem changeWithTimeMenuItem = new MenuItem("Change with time");
       changeWithTimeMenuItem.setOnAction(e -> {
-         final ChangeWithTimeDialog changeWithTimeDialog = new ChangeWithTimeDialog();
-         changeWithTimeDialog.setModel(model);
-         changeWithTimeDialog.setActiveWorkSecondsProperty(activeWorkSecondsProperty);
-         changeWithTimeDialog.setUpDialog(p);
-
+         final ChangeWithTimeDialog changeWithTimeDialog = new ChangeWithTimeDialog(model, activeWorkSecondsProperty,
+               p);
          mainStage.setAlwaysOnTop(false);
-         final Optional<Integer> result = changeWithTimeDialog.show();
+         final Optional<Integer> result = changeWithTimeDialog.showAndWait();
          result.ifPresent(minusSeconds -> changeProject(p, minusSeconds));
          mainStage.setAlwaysOnTop(true);
       });