Adapt demo to the new architecture

Author: pcastornii

patternfx-demo/pom.xml

@@ -16,7 +16,7 @@
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
         <!-- JavaFX 19 has a bug: it shows a system notification on Ubuntu when a dialog is closed -->
-        <javafx.version>25</javafx.version>
+        <javafx.version>18</javafx.version>
     </properties>
 
     <dependencies>

patternfx-demo/src/main/java/com/techsenger/patternfx/demo/PersonDialogView.java

@@ -17,7 +17,6 @@
 package com.techsenger.patternfx.demo;
 
 import com.techsenger.patternfx.core.AbstractParentView;
-import com.techsenger.patternfx.demo.model.Person;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.BooleanProperty;
 import javafx.event.ActionEvent;
@@ -57,16 +56,16 @@ public class PersonDialogView extends AbstractParentView<PersonDialogViewModel,
     private final HBox hBox = new HBox(firstNameLabel, firstNameTextField, lastNameLabel, lastNameTextField,
                 ageLabel, ageTextField);
 
-    private final Dialog<Person> dialog = new Dialog<>();
+    private final Dialog<ButtonType> dialog = new Dialog<>();
 
     private Button okButton;
 
-    public PersonDialogView(Stage stage, PersonDialogViewModel viewModel) {
+    public PersonDialogView(PersonDialogViewModel viewModel, Stage stage) {
         super(viewModel);
         this.stage = stage;
     }
 
-    public Dialog<Person> getDialog() {
+    protected Dialog<ButtonType> getDialog() {
         return this.dialog;
     }
 
@@ -86,13 +85,6 @@ protected void build() {
         dialog.initModality(Modality.WINDOW_MODAL);
         dialog.getDialogPane().setContent(hBox);
         dialog.getDialogPane().getButtonTypes().addAll(ButtonType.CANCEL, ButtonType.OK);
-        dialog.setResultConverter(dialogButton -> {
-            if (dialogButton == ButtonType.OK) {
-                return getViewModel().createPerson();
-            }
-            return null;
-        });
-
         this.okButton = (Button) dialog.getDialogPane().lookupButton(ButtonType.OK);
     }
 
@@ -114,7 +106,7 @@ protected void bind() {
     protected void addHandlers() {
         super.addHandlers();
         okButton.addEventFilter(ActionEvent.ACTION, event -> {
-            if (!getViewModel().isPersonValid()) {
+            if (!getViewModel().addNewPerson()) {
                 event.consume();
             }
         });

patternfx-demo/src/main/java/com/techsenger/patternfx/demo/PersonDialogViewModel.java

@@ -19,6 +19,7 @@
 import com.techsenger.patternfx.core.AbstractParentViewModel;
 import com.techsenger.patternfx.core.ParentMediator;
 import com.techsenger.patternfx.demo.model.Person;
+import java.util.function.Consumer;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -46,6 +47,12 @@ public class PersonDialogViewModel extends AbstractParentViewModel<ParentMediato
 
     private final BooleanProperty ageValid = new SimpleBooleanProperty(true);
 
+    private final Consumer<Person> resultCallback;
+
+    public PersonDialogViewModel(Consumer<Person> resultCallback) {
+        this.resultCallback = resultCallback;
+    }
+
     public String getFirstName() {
         return firstName.get();
     }
@@ -98,18 +105,22 @@ BooleanProperty ageValidProperty() {
         return ageValid;
     }
 
-    boolean isPersonValid() {
+    boolean addNewPerson() {
+        if (isPersonValid()) {
+            var newPerson = new Person(getFirstName(), getLastName(), getAge());
+            this.resultCallback.accept(newPerson);
+            return true;
+        }
+        return false;
+    }
+
+    private boolean isPersonValid() {
         firstNameValid.set(isFirstNameValid());
         lastNameValid.set(isLastNameValid());
         ageValid.set(isAgeValid());
         return firstNameValid.get() && lastNameValid.get() && ageValid.get();
     }
 
-    Person createPerson() {
-        var newPerson = new Person(getFirstName(), getLastName(), getAge());
-        return newPerson;
-    }
-
     private boolean isFirstNameValid() {
         var name = getFirstName();
         return name != null && !name.isBlank();

patternfx-demo/src/main/java/com/techsenger/patternfx/demo/PersonRegistryComponent.java

@@ -25,6 +25,18 @@
  */
 public class PersonRegistryComponent extends AbstractParentComponent<PersonRegistryView> {
 
+    private final class Mediator extends AbstractParentComponent.Mediator implements PersonRegistryMediator {
+
+        @Override
+        public void openDialog(PersonDialogViewModel vm) {
+            var dialogV = new PersonDialogView(vm, getView().getStage());
+            var dialogC = new PersonDialogComponent(dialogV);
+            dialogC.initialize();
+            dialogC.getView().getDialog().showAndWait();
+            dialogC.deinitialize();
+        }
+    }
+
     public PersonRegistryComponent(PersonRegistryView view) {
         super(view);
     }
@@ -36,6 +48,6 @@ public ComponentName getName() {
 
     @Override
     protected Mediator createMediator() {
-        return new AbstractParentComponent.Mediator() { };
+        return new Mediator();
     }
 }

patternfx-demo/src/main/java/com/techsenger/patternfx/demo/PersonRegistryMediator.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2024-2025 Pavel Castornii.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.techsenger.patternfx.demo;
+
+import com.techsenger.patternfx.core.ParentMediator;
+
+/**
+ *
+ * @author Pavel Castornii
+ */
+public interface PersonRegistryMediator extends ParentMediator {
+
+    void openDialog(PersonDialogViewModel dialog);
+}

patternfx-demo/src/main/java/com/techsenger/patternfx/demo/PersonRegistryView.java

@@ -98,19 +98,12 @@ protected void bind() {
     protected void addHandlers() {
         super.addHandlers();
         var vm = getViewModel();
-        addButton.setOnAction(e -> {
-            var dialogVM = vm.createDialog();
-            var dialogV = new PersonDialogView(stage, dialogVM);
-            var dialogComponent = new PersonDialogComponent(dialogV);
-            dialogComponent.initialize();
-
-            var jfxDialog = dialogV.getDialog();
-            var result = jfxDialog.showAndWait();
-            vm.add(result);
-
-            dialogComponent.deinitialize();
-        });
+        addButton.setOnAction(e -> vm.add());
         removeButton.setOnAction(e -> vm.remove());
         refreshButton.setOnAction(e -> vm.refresh());
     }
+
+    Stage getStage() {
+        return stage;
+    }
 }

patternfx-demo/src/main/java/com/techsenger/patternfx/demo/PersonRegistryViewModel.java

@@ -18,10 +18,9 @@
 
 import com.techsenger.patternfx.core.AbstractParentViewModel;
 import com.techsenger.patternfx.core.ComponentState;
-import com.techsenger.patternfx.core.ParentMediator;
 import com.techsenger.patternfx.demo.model.Person;
 import com.techsenger.patternfx.demo.model.PersonService;
-import java.util.Optional;
+import java.util.Iterator;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
@@ -38,7 +37,7 @@
  *
  * @author Pavel Castornii
  */
-public class PersonRegistryViewModel extends AbstractParentViewModel<ParentMediator> {
+public class PersonRegistryViewModel extends AbstractParentViewModel<PersonRegistryMediator> {
 
     private static final Logger logger = LoggerFactory.getLogger(PersonRegistryViewModel.class);
 
@@ -84,10 +83,6 @@ ObjectProperty<Person> selectedPersonProperty() {
         return selectedPerson;
     }
 
-    PersonDialogViewModel createDialog() {
-        return new PersonDialogViewModel();
-    }
-
     BooleanProperty removeDisabledProperty() {
         return this.removeDisabled;
     }
@@ -97,17 +92,25 @@ void refresh() {
         persons.addAll(service.readAll());
     }
 
-    void add(Optional<Person> person) {
-        if (person.isPresent()) {
-            var p = person.get();
-            service.save(p);
-            persons.add(p);
-        }
+    void add() {
+        var dialogVM = new PersonDialogViewModel((p) -> add(p));
+        getMediator().openDialog(dialogVM);
     }
 
     void remove() {
         var id = selectedPerson.get().getId();
         service.delete(id);
-        persons.removeIf(p -> p.getId().equals(id));
+        for (Iterator<Person> it = persons.iterator(); it.hasNext();) {
+            Person p = it.next();
+            if (p.getId() == id) {
+                it.remove();
+                break;
+            }
+        }
+    }
+
+    private void add(Person person) {
+        service.save(person);
+        persons.add(person);
     }
 }