Correct composer methods

Author: pcastornii

README.md

@@ -591,7 +591,9 @@ public interface FooView extends ParentView {
 
     interface Composer extends ParentView.Composer {
 
-        void addBar(ComponentConfig config);
+        void showBar(ComponentConfig config);
+
+        void hideBar();
 
         BarPort getBar();
     }
@@ -615,7 +617,7 @@ public class FooPresenter<V extends FooView> extends AbstractParentPresenter<V>
     public void onAction() {
         var params = new ComponentParams();
         ...
-        getView().getComposer().addBar(params);
+        getView().getComposer().showBar(params);
         // use bar
     }
 
@@ -630,8 +632,10 @@ public class FooFxView<P extends FooPresenter<?>> extends AbstractParentFxView<P
 
     public class Composer extends AbstractParentFxView<P>.Composer implements FooView.Composer {
 
+        private BarFxView bar;
+
         @Override
-        public void addBar(ComponentParams params) {
+        public void showBar(ComponentParams params) {
             bar = new BarFxView();
             var p = new BarPresenter(bar, params);
             p.initialize();
@@ -647,9 +651,15 @@ public class FooFxView<P extends FooPresenter<?>> extends AbstractParentFxView<P
                 return null;
             }
         }
-    }
 
-    private BarFxView bar;
+        @Override
+        public void hideBar() {
+            getModifiableChildren().remove(bar);
+            someNode.getChildren().remove(bar.getNode()); // removing bar view from foo view
+            bar.getPresenter().deinitialize();
+            bar = null;
+        }
+    }
 
     public FooFxView() {
         ...

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

@@ -46,8 +46,10 @@ public class Composer extends AbstractParentFxView<P>.Composer implements Regist
 
         private final RegistryFxView<P> view = RegistryFxView.this;
 
+        private @Nullable ReportFxView report;
+
         @Override
-        public DialogPort showDialog() {
+        public DialogPort openDialog() {
             var v = new DialogFxView(view.getStage());
             var p = new DialogPresenter<>(v, new ComponentParams());
             p.initialize();
@@ -57,35 +59,33 @@ public DialogPort showDialog() {
 
         @Override
         public @Nullable ReportPort getReport() {
-            if (view.getReport() == null) {
+            if (report == null) {
                 return null;
             }
-            return view.getReport().getPresenter();
+            return report.getPresenter();
         }
 
         @Override
-        public void addReport() {
-            if (view.getReport() != null) {
+        public void showReport() {
+            if (report != null) {
                 throw new IllegalStateException("Report has been added");
             }
-            var reportV = new ReportFxView();
-            var reportP = new ReportPresenter(reportV, new ComponentParams());
+            report = new ReportFxView();
+            var reportP = new ReportPresenter(report, new ComponentParams());
             reportP.initialize();
-            view.root.getChildren().add(reportV.getNode());
-            view.getModifiableChildren().add(reportV);
-            view.report = reportV;
+            view.root.getChildren().add(report.getNode());
+            view.getModifiableChildren().add(report);
         }
 
         @Override
-        public void removeReport() {
-            var report = view.getReport();
+        public void hideReport() {
             if (report == null) {
                 throw new IllegalStateException("Report hasn't been added");
             }
             view.getModifiableChildren().remove(report);
             view.root.getChildren().remove(report.getNode());
-            view.report = null;
             report.getPresenter().deinitialize();
+            report = null;
         }
     }
 
@@ -109,8 +109,6 @@ public void removeReport() {
 
     private final Stage stage = new Stage();
 
-    private @Nullable ReportFxView report;
-
     public RegistryFxView() {
         super();
     }
@@ -218,10 +216,6 @@ Stage getStage() {
         return stage;
     }
 
-    @Nullable ReportFxView getReport() {
-        return report;
-    }
-
     private void setupColumn(TableColumn<?, ?> column) {
         column.setResizable(false);
         column.prefWidthProperty().bind(personTable.widthProperty().multiply(0.25).subtract(1));

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

@@ -52,7 +52,7 @@ protected void onSelectedChanged(int value) {
     }
 
     protected void onAdd() {
-        var dialog = getView().getComposer().showDialog();
+        var dialog = getView().getComposer().openDialog();
         var newPerson = dialog.getResult();
         dialog.deinitialize();
         if (newPerson != null) {
@@ -86,11 +86,11 @@ protected void onRefresh() {
     protected void onReport() {
         var composer = getView().getComposer();
         if (composer.getReport() == null) {
-            composer.addReport();
+            composer.showReport();
             updateReport();
             getView().setReportShown(true);
         } else {
-            composer.removeReport();
+            composer.hideReport();
             getView().setReportShown(false);
         }
     }

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

@@ -29,13 +29,13 @@ public interface RegistryView extends ParentView {
 
     interface Composer extends ParentView.Composer {
 
-        DialogPort showDialog();
+        DialogPort openDialog();
 
         @Nullable ReportPort getReport();
 
-        void addReport();
+        void showReport();
 
-        void removeReport();
+        void hideReport();
     }
 
     @Override

patternfx-demo/src/main/java/com/techsenger/patternfx/demo/mvvm/RegistryComposer.java

@@ -26,7 +26,7 @@ public interface RegistryComposer extends Composer {
 
     void openDialog(DialogViewModel dialog);
 
-    void addReport(ReportViewModel report);
+    void showReport(ReportViewModel report);
 
-    void removeReport();
+    void hideReport();
 }

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

@@ -54,7 +54,7 @@ public void openDialog(DialogViewModel vm) {
         }
 
         @Override
-        public void addReport(ReportViewModel vm) {
+        public void showReport(ReportViewModel vm) {
             var v = new ReportView(vm);
             v.initialize();
             root.getChildren().add(v.getNode());
@@ -63,7 +63,7 @@ public void addReport(ReportViewModel vm) {
         }
 
         @Override
-        public void removeReport() {
+        public void hideReport() {
             root.getChildren().remove(root.getChildren().size() - 1);
             getModifiableChildren().remove(report.get());
             report.get().deinitialize();

patternfx-demo/src/main/java/com/techsenger/patternfx/demo/mvvm/RegistryViewModel.java

@@ -149,13 +149,13 @@ void onRemove() {
     void onToggleReport() {
         Objects.requireNonNull(getComposer());
         if (getReport() == null) {
-            getComposer().addReport(new ReportViewModel());
+            getComposer().showReport(new ReportViewModel());
             var report = getReport();
             Objects.requireNonNull(report);
             report.refresh(persons);
             updateReportButtonText(true);
         } else {
-            getComposer().removeReport();
+            getComposer().hideReport();
             updateReportButtonText(false);
         }
     }