Adapt to the changes in patternfx

Author: pcastornii

tabshell-core/src/main/java/com/techsenger/tabshell/core/DefaultShellPresenter.java

@@ -20,15 +20,12 @@
 import com.techsenger.patternfx.mvp.AbstractParentPresenter;
 import com.techsenger.patternfx.mvp.Descriptor;
 import com.techsenger.patternfx.mvp.Presenter;
-import com.techsenger.tabshell.core.dialog.DialogPort;
 import com.techsenger.tabshell.core.menu.MenuDelegate;
 import com.techsenger.tabshell.core.menu.MenuDelegates;
 import com.techsenger.tabshell.core.menu.MenuItemDelegate;
-import com.techsenger.tabshell.core.popup.PopupPort;
 import com.techsenger.tabshell.material.icon.Icon;
 import com.techsenger.tabshell.material.menu.MenuItemName;
 import com.techsenger.tabshell.material.menu.MenuName;
-import java.util.List;
 import java.util.function.Consumer;
 
 /**
@@ -168,16 +165,6 @@ public void setMaximized(boolean maximized) {
         getView().setMaximized(maximized);
     }
 
-    @Override
-    public List<? extends PopupPort> getPopups() {
-        return getComposer().getPopupPorts();
-    }
-
-    @Override
-    public List<? extends DialogPort> getDialogs() {
-        return getComposer().getDialogPorts();
-    }
-
     @Override
     public MenuDelegate getMenuDelegate(MenuName menuName) {
         return menuDelegates.getMenuDelegatesByName().get(menuName);

tabshell-core/src/main/java/com/techsenger/tabshell/core/dialog/DialogContainerComposer.java

@@ -16,20 +16,12 @@
 
 package com.techsenger.tabshell.core.dialog;
 
-import com.techsenger.annotations.Unmodifiable;
 import com.techsenger.tabshell.core.popup.PopupContainerComposer;
-import java.util.List;
 
 /**
  *
  * @author Pavel Castornii
  */
-public interface DialogContainerComposer extends PopupContainerComposer {
+public interface DialogContainerComposer extends DialogContainerComposerBase, PopupContainerComposer {
 
-    /**
-     * Returns an unmodifiable list of dialogs. A new list instance is created on each call.
-     *
-     * @return
-     */
-    @Unmodifiable List<? extends DialogPort> getDialogPorts();
 }

tabshell-core/src/main/java/com/techsenger/tabshell/core/dialog/DialogContainerComposerBase.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2024-2026 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.tabshell.core.dialog;
+
+import com.techsenger.annotations.Unmodifiable;
+import com.techsenger.tabshell.core.popup.PopupContainerComposerBase;
+import java.util.List;
+
+/**
+ *
+ * @author Pavel Castornii
+ */
+public interface DialogContainerComposerBase extends PopupContainerComposerBase {
+
+    /**
+     * Returns an unmodifiable list of dialogs. A new list instance is created on each call.
+     *
+     * @return
+     */
+    @Unmodifiable List<? extends DialogPort> getDialogPorts();
+}

tabshell-core/src/main/java/com/techsenger/tabshell/core/dialog/DialogContainerPort.java

@@ -17,18 +17,13 @@
 package com.techsenger.tabshell.core.dialog;
 
 import com.techsenger.tabshell.core.popup.PopupContainerPort;
-import java.util.List;
 
 /**
  *
  * @author Pavel Castornii
  */
 public interface DialogContainerPort extends PopupContainerPort {
 
-    /**
-     * Returns the list of open dialogs.
-     *
-     * @return
-     */
-    List<? extends DialogPort> getDialogs();
+    @Override
+    DialogContainerComposerBase getComposer();
 }

tabshell-core/src/main/java/com/techsenger/tabshell/core/page/PageContainerComposer.java

@@ -16,10 +16,12 @@
 
 package com.techsenger.tabshell.core.page;
 
+import com.techsenger.patternfx.mvp.ParentComposer;
+
 /**
  *
  * @author Pavel Castornii
  */
-public interface PageContainerComposer {
+public interface PageContainerComposer extends PageContainerComposerBase, ParentComposer {
 
 }

tabshell-core/src/main/java/com/techsenger/tabshell/core/page/PageContainerComposerBase.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2024-2026 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.tabshell.core.page;
+
+import com.techsenger.annotations.Unmodifiable;
+import com.techsenger.patternfx.mvp.ComposerBase;
+import java.util.List;
+
+/**
+ *
+ * @author Pavel Castornii
+ */
+public interface PageContainerComposerBase extends ComposerBase {
+
+    /**
+     * Returns a list of created and initialized pages.
+     *
+     * @return
+     */
+    @Unmodifiable List<? extends PagePort> getPagePorts();
+
+    PagePort getSelectedPagePort();
+}

tabshell-core/src/main/java/com/techsenger/tabshell/core/page/PageContainerPort.java

@@ -16,13 +16,16 @@
 
 package com.techsenger.tabshell.core.page;
 
+import com.techsenger.patternfx.mvp.ParentPort;
+
 /**
  *
  * @author Pavel Castornii
  */
-public interface PageContainerPort {
+public interface PageContainerPort extends ParentPort {
 
-    PagePort getSelectedPage();
+    @Override
+    PageContainerComposerBase getComposer();
 
     void selectPage(PageItem item);
 

tabshell-core/src/main/java/com/techsenger/tabshell/core/page/TreePageContainerComposer.java

@@ -16,10 +16,12 @@
 
 package com.techsenger.tabshell.core.page;
 
+import com.techsenger.patternfx.mvp.ParentComposer;
+
 /**
  *
  * @author Pavel Castornii
  */
-public interface TreePageContainerComposer {
+public interface TreePageContainerComposer extends TreePageContainerComposerBase, ParentComposer {
 
 }

tabshell-core/src/main/java/com/techsenger/tabshell/core/page/TreePageContainerComposerBase.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2024-2026 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.tabshell.core.page;
+
+import com.techsenger.annotations.Unmodifiable;
+import com.techsenger.patternfx.mvp.ComposerBase;
+import java.util.List;
+
+/**
+ *
+ * @author Pavel Castornii
+ */
+public interface TreePageContainerComposerBase extends ComposerBase {
+
+    /**
+     * Returns a list of created and initialized pages.
+     *
+     * @return
+     */
+    @Unmodifiable List<? extends PagePort> getPagePorts();
+
+    PagePort getSelectedPagePort();
+}

tabshell-core/src/main/java/com/techsenger/tabshell/core/page/TreePageContainerPort.java

@@ -16,13 +16,16 @@
 
 package com.techsenger.tabshell.core.page;
 
+import com.techsenger.patternfx.mvp.ParentPort;
+
 /**
  *
  * @author Pavel Castornii
  */
-public interface TreePageContainerPort {
+public interface TreePageContainerPort extends ParentPort {
 
-    PagePort getSelectedPage();
+    @Override
+    TreePageContainerComposerBase getComposer();
 
     void selectPage(TreePageItem item);
 }