Remove view model argument for the default init/deinit methods of View

Author: pcastornii

mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractChildView.java

@@ -31,9 +31,4 @@ public AbstractChildView(T viewModel) {
     public AbstractChildComponent<?> getComponent() {
         return (AbstractChildComponent<?>) super.getComponent();
     }
-
-    @Override
-    protected void addListeners(T viewModel) {
-        super.addListeners(viewModel);
-    }
 }

mvvm4fx-core/src/main/java/com/techsenger/mvvm4fx/core/AbstractComponentView.java

@@ -49,68 +49,68 @@ public AbstractComponent<?> getComponent() {
      * Performs initialization.
      */
     protected void initialize() {
-        build(viewModel);
-        bind(viewModel);
-        addListeners(viewModel);
-        addHandlers(viewModel);
+        build();
+        bind();
+        addListeners();
+        addHandlers();
     }
 
     /**
      * Performs deinitialization.
      */
     protected void deinitialize() {
-        removeHandlers(viewModel);
-        removeListeners(viewModel);
-        unbind(viewModel);
-        unbuild(viewModel);
+        removeHandlers();
+        removeListeners();
+        unbind();
+        unbuild();
     }
 
     /**
      * Builds view.
      */
-    protected void build(T viewModel) { }
+    protected void build() { }
 
     /**
      * Binds view to viewModel etc.
      */
-    protected void bind(T viewModel) { }
+    protected void bind() { }
 
     /**
      * Initializes listeners to different properties etc.
      */
-    protected void addListeners(T viewModel) { }
+    protected void addListeners() { }
 
     /**
      * Initializes handlers for mouse, keyboard etc events.
      */
-    protected void addHandlers(T viewModel) { }
+    protected void addHandlers() { }
 
     /**
      * Removes handlers.
      *
      * @param viewModel
      */
-    protected void removeHandlers(T viewModel) { }
+    protected void removeHandlers() { }
 
     /**
      * Removes listeners.
      *
      * @param viewModel
      */
-    protected void removeListeners(T viewModel) { }
+    protected void removeListeners() { }
 
     /**
      * Unbinds view from viewModel etc.
      *
      * @param viewModel
      */
-    protected void unbind(T viewModel) { }
+    protected void unbind() { }
 
     /**
      * Unbuilds view.
      * @param viewModel
      */
-    protected void unbuild(T viewModel) { }
+    protected void unbuild() { }
 
     void setComponent(AbstractComponent<?> component) {
         this.component = component;

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

@@ -71,8 +71,8 @@ public Dialog<Person> getDialog() {
     }
 
     @Override
-    protected void build(PersonDialogViewModel viewModel) {
-        super.build(viewModel);
+    protected void build() {
+        super.build();
         firstNameLabel.setMinWidth(Region.USE_PREF_SIZE);
         HBox.setHgrow(firstNameTextField, Priority.ALWAYS);
         lastNameLabel.setMinWidth(Region.USE_PREF_SIZE);
@@ -88,7 +88,7 @@ protected void build(PersonDialogViewModel viewModel) {
         dialog.getDialogPane().getButtonTypes().addAll(ButtonType.CANCEL, ButtonType.OK);
         dialog.setResultConverter(dialogButton -> {
             if (dialogButton == ButtonType.OK) {
-                return viewModel.createPerson();
+                return getViewModel().createPerson();
             }
             return null;
         });
@@ -97,24 +97,25 @@ protected void build(PersonDialogViewModel viewModel) {
     }
 
     @Override
-    protected void bind(PersonDialogViewModel viewModel) {
-        super.bind(viewModel);
-        dialog.titleProperty().bind(viewModel.titleProperty());
-
-        firstNameTextField.textProperty().bindBidirectional(viewModel.getPerson().firstNameProperty());
-        bindValid(firstNameTextField, viewModel.firstNameValidProperty());
-        lastNameTextField.textProperty().bindBidirectional(viewModel.getPerson().lastNameProperty());
-        bindValid(lastNameTextField, viewModel.lastNameValidProperty());
-        ageTextField.textProperty().bindBidirectional(viewModel.getPerson().ageProperty(),
+    protected void bind() {
+        super.bind();
+        var vm = getViewModel();
+        dialog.titleProperty().bind(vm.titleProperty());
+
+        firstNameTextField.textProperty().bindBidirectional(vm.getPerson().firstNameProperty());
+        bindValid(firstNameTextField, vm.firstNameValidProperty());
+        lastNameTextField.textProperty().bindBidirectional(vm.getPerson().lastNameProperty());
+        bindValid(lastNameTextField, vm.lastNameValidProperty());
+        ageTextField.textProperty().bindBidirectional(vm.getPerson().ageProperty(),
                 new IntegerStringConverter());
-        bindValid(ageTextField, viewModel.ageValidProperty());
+        bindValid(ageTextField, vm.ageValidProperty());
     }
 
     @Override
-    protected void addHandlers(PersonDialogViewModel viewModel) {
-        super.addHandlers(viewModel);
+    protected void addHandlers() {
+        super.addHandlers();
         okButton.addEventFilter(ActionEvent.ACTION, event -> {
-            if (!viewModel.isPersonValid()) {
+            if (!getViewModel().isPersonValid()) {
                 event.consume();
             }
         });

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

@@ -56,10 +56,10 @@ public PersonRegistryView(Stage stage, PersonRegistryViewModel viewModel) {
     }
 
     @Override
-    protected void build(PersonRegistryViewModel viewModel) {
-        super.build(viewModel);
+    protected void build() {
+        super.build();
         VBox.setVgrow(personTable, Priority.ALWAYS);
-        personTable.setItems(viewModel.getPersons());
+        personTable.setItems(getViewModel().getPersons());
         personTable.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
         var idColumn = new TableColumn<Person, Integer>("Id");
         idColumn.setCellValueFactory(data -> data.getValue().idProperty());
@@ -78,31 +78,33 @@ protected void build(PersonRegistryViewModel viewModel) {
     }
 
     @Override
-    protected void bind(PersonRegistryViewModel viewModel) {
-        super.bind(viewModel);
-        stage.titleProperty().bind(viewModel.titleProperty());
-        viewModel.selectedPersonProperty().bind(personTable.getSelectionModel().selectedItemProperty());
-        removeButton.disableProperty().bind(viewModel.removeDisabledProperty());
+    protected void bind() {
+        super.bind();
+        var vm = getViewModel();
+        stage.titleProperty().bind(vm.titleProperty());
+        vm.selectedPersonProperty().bind(personTable.getSelectionModel().selectedItemProperty());
+        removeButton.disableProperty().bind(vm.removeDisabledProperty());
     }
 
     @Override
-    protected void addHandlers(PersonRegistryViewModel viewModel) {
-        super.addHandlers(viewModel);
+    protected void addHandlers() {
+        super.addHandlers();
+        var vm = getViewModel();
         addButton.setOnAction(e -> {
-            var dialogVM = viewModel.createDialog();
+            var dialogVM = vm.createDialog();
             var dialogV = new PersonDialogView(stage, dialogVM);
             var dialogComponent = new PersonDialog(dialogV);
             dialogComponent.initialize();
 
             var jfxDialog = dialogV.getDialog();
             // javafx 19 has a bug - it shows a system notification in Ubuntu when closing
             var result = jfxDialog.showAndWait();
-            viewModel.add(result);
+            vm.add(result);
 
             dialogComponent.deinitialize();
         });
-        removeButton.setOnAction(e -> viewModel.remove());
-        refreshButton.setOnAction(e -> viewModel.refresh());
+        removeButton.setOnAction(e -> vm.remove());
+        refreshButton.setOnAction(e -> vm.refresh());
     }
 
     void showStage() {