Refactor demo

Author: pcastornii

patternfx-demo/src/main/java/com/techsenger/patternfx/demo/mvp/DialogFxView.java

@@ -81,21 +81,6 @@ public void setAgeValid(boolean value) {
         updateValid(ageTextField, value);
     }
 
-    @Override
-    public String getFirstName() {
-        return this.firstNameTextField.getText();
-    }
-
-    @Override
-    public String getLastName() {
-        return this.lastNameTextField.getText();
-    }
-
-    @Override
-    public String getAge() {
-        return this.ageTextField.getText();
-    }
-
     protected Dialog<ButtonType> getDialog() {
         return this.dialog;
     }
@@ -119,6 +104,15 @@ protected void build() {
         this.okButton = (Button) dialog.getDialogPane().lookupButton(ButtonType.OK);
     }
 
+    @Override
+    protected void addListeners() {
+        super.addListeners();
+        var p = getPresenter();
+        this.firstNameTextField.textProperty().addListener((ov, oldV, newV) -> p.onFirstNameChanged(newV));
+        this.lastNameTextField.textProperty().addListener((ov, oldV, newV) -> p.onLastNameChanged(newV));
+        this.ageTextField.textProperty().addListener((ov, oldV, newV) -> p.onAgeChanged(newV));
+    }
+
     @Override
     protected void addHandlers() {
         super.addHandlers();

patternfx-demo/src/main/java/com/techsenger/patternfx/demo/mvp/DialogPresenter.java

@@ -37,6 +37,12 @@ public Person getResult() {
         }
     }
 
+    private String firstName;
+
+    private String lastName;
+
+    private Integer age;
+
     private Person result;
 
     public DialogPresenter(T view) {
@@ -53,9 +59,21 @@ protected Descriptor createDescriptor() {
         return new Descriptor(DemoNames.PERSON_DIALOG);
     }
 
+    protected void onFirstNameChanged(String value) {
+        this.firstName = value;
+    }
+
+    protected void onLastNameChanged(String value) {
+        this.lastName = value;
+    }
+
+    protected void onAgeChanged(String value) {
+        this.age = Integer.valueOf(value);
+    }
+
     protected boolean onOk() {
         var v = getView();
-        this.result = new Person(v.getFirstName(), v.getLastName(), Integer.valueOf(v.getAge()));
+        this.result = new Person(firstName, lastName, age);
         if (!checkIfValid()) {
             this.result = null;
             return false;

patternfx-demo/src/main/java/com/techsenger/patternfx/demo/mvp/DialogView.java

@@ -24,12 +24,6 @@
  */
 public interface DialogView extends ParentView {
 
-    String getFirstName();
-
-    String getLastName();
-
-    String getAge();
-
     void setFirstNameValid(boolean value);
 
     void setLastNameValid(boolean value);

patternfx-demo/src/main/java/com/techsenger/patternfx/demo/mvp/RegistryFxView.java

@@ -114,13 +114,13 @@ public RegistryFxView() {
     }
 
     @Override
-    public void setRemoveDisable(boolean v) {
+    public void setRemoveDisabled(boolean v) {
         this.removeButton.setDisable(v);
     }
 
     @Override
-    public void setReportVisible(boolean visible) {
-        if (visible) {
+    public void setReportShown(boolean value) {
+        if (value) {
             reportButton.setText("Hide Report");
         } else {
             reportButton.setText("Show Report");
@@ -142,21 +142,11 @@ public void addPersons(List<Person> persons) {
         this.personTable.getItems().addAll(persons);
     }
 
-    @Override
-    public List<Person> getPersons() {
-        return this.personTable.getItems();
-    }
-
     @Override
     public void removePerson(int index) {
         this.personTable.getItems().remove(index);
     }
 
-    @Override
-    public int getSelectedIndex() {
-        return this.personTable.getSelectionModel().getSelectedIndex();
-    }
-
     @Override
     public void clearPersons() {
         this.personTable.getItems().clear();
@@ -186,8 +176,8 @@ protected void build() {
 
         HBox.setHgrow(spacer, Priority.ALWAYS);
 
-        setReportVisible(false);
-        setRemoveDisable(true);
+        setReportShown(false);
+        setRemoveDisabled(true);
 
         stage.setTitle("PatternFX - MVP");
         stage.setScene(new Scene(root, 800, 500));

patternfx-demo/src/main/java/com/techsenger/patternfx/demo/mvp/RegistryPresenter.java

@@ -17,9 +17,11 @@
 package com.techsenger.patternfx.demo.mvp;
 
 import com.techsenger.patternfx.demo.DemoNames;
+import com.techsenger.patternfx.demo.model.Person;
 import com.techsenger.patternfx.demo.model.PersonService;
 import com.techsenger.patternfx.mvp.AbstractParentPresenter;
 import com.techsenger.patternfx.mvp.Descriptor;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -29,8 +31,12 @@
 public class RegistryPresenter<V extends RegistryView, C extends RegistryComposer>
         extends AbstractParentPresenter<V, C> {
 
+    private final List<Person> persons = new ArrayList<>();
+
     private final PersonService service;
 
+    private int selectedIndex;
+
     public RegistryPresenter(V view, PersonService service) {
         super(view);
         this.service = service;
@@ -42,7 +48,7 @@ protected Descriptor createDescriptor() {
     }
 
     protected void onSelectedChanged(int value) {
-        getView().setRemoveDisable(value < 0);
+        getView().setRemoveDisabled(value < 0);
     }
 
     protected void onAdd() {
@@ -51,36 +57,39 @@ protected void onAdd() {
         dialog.deinitialize();
         if (newPerson != null) {
             service.save(newPerson);
+            persons.add(newPerson);
             getView().addPersons(List.of(newPerson));
             updateReport();
         }
     }
 
     protected void onRemove() {
-        var selectedIndex = getView().getSelectedIndex();
         if (selectedIndex < 0) {
             return;
         }
-        var person = getView().getPersons().get(selectedIndex);
+        var person = persons.get(selectedIndex);
         service.delete(person.getId());
+        persons.remove(selectedIndex);
         getView().removePerson(selectedIndex);
         updateReport();
     }
 
     protected void onRefresh() {
+        this.persons.clear();
         getView().clearPersons();
-        getView().addPersons(service.readAll());
+        this.persons.addAll(service.readAll());
+        getView().addPersons(this.persons);
         updateReport();
     }
 
     protected void onReport() {
         if (getComposer().getReport() == null) {
             getComposer().addReport();
-            getComposer().getReport().refresh(getView().getPersons());
-            getView().setReportVisible(true);
+            updateReport();
+            getView().setReportShown(true);
         } else {
             getComposer().removeReport();
-            getView().setReportVisible(false);
+            getView().setReportShown(false);
         }
     }
 
@@ -98,7 +107,7 @@ protected void postInitialize() {
     private void updateReport() {
         var report = getComposer().getReport();
         if (report != null) {
-            report.refresh(getView().getPersons());
+            report.refresh(persons);
         }
     }
 

patternfx-demo/src/main/java/com/techsenger/patternfx/demo/mvp/RegistryView.java

@@ -26,19 +26,15 @@
  */
 public interface RegistryView extends ParentView {
 
-    void setRemoveDisable(boolean value);
+    void setRemoveDisabled(boolean value);
 
-    void setReportVisible(boolean shown);
+    void setReportShown(boolean value);
 
     void showStage();
 
     void addPersons(List<Person> persons);
 
     void removePerson(int index);
 
-    List<Person> getPersons();
-
-    int getSelectedIndex();
-
     void clearPersons();
 }