You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/09/20 10:31:19 UTC

[causeway] branch 3582-autoalign.dropdown.links updated: CAUSEWAY-3582: common underlying panel: MenuablePanelAbstract

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch 3582-autoalign.dropdown.links
in repository https://gitbox.apache.org/repos/asf/causeway.git


The following commit(s) were added to refs/heads/3582-autoalign.dropdown.links by this push:
     new cbf5d26b17 CAUSEWAY-3582: common underlying panel: MenuablePanelAbstract
cbf5d26b17 is described below

commit cbf5d26b17b3c5070f34793df6f80edf07a39507
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Sep 20 12:31:15 2023 +0200

    CAUSEWAY-3582: common underlying panel: MenuablePanelAbstract
---
 .../{ListOfMenuables.java => MenuablesModel.java}  | 20 +++++++++----
 .../entityactions/AdditionalLinksPanel.java        | 16 ++++------
 .../serviceactions/CssSubMenuItemsPanel.java       | 35 ++++++++++------------
 .../ui/components/collection/selector/_Util.java   |  3 ++
 .../MenuablePanelAbstract.java}                    | 23 +++++++-------
 5 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/links/ListOfMenuables.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/links/MenuablesModel.java
similarity index 69%
rename from viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/links/ListOfMenuables.java
rename to viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/links/MenuablesModel.java
index b7c004b902..9f6b091839 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/links/ListOfMenuables.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/links/MenuablesModel.java
@@ -18,6 +18,7 @@
  */
 package org.apache.causeway.viewer.wicket.model.links;
 
+import java.util.List;
 import java.util.stream.Stream;
 
 import org.apache.wicket.model.ChainingModel;
@@ -26,15 +27,20 @@ import org.apache.causeway.commons.collections.Can;
 
 import lombok.NonNull;
 
-public class ListOfMenuables
+public class MenuablesModel
 extends ChainingModel<Can<? extends Menuable>> {
 
     private static final long serialVersionUID = 1L;
 
-    public ListOfMenuables(final @NonNull Can<? extends Menuable> menuables) {
+    public MenuablesModel(final @NonNull Can<? extends Menuable> menuables) {
         super(menuables);
     }
 
+    @Deprecated //TODO[CAUSEWAY-3582]
+    public MenuablesModel(final @NonNull List<? extends Menuable> menuables) {
+        super(Can.ofCollection(menuables));
+    }
+
     @SuppressWarnings("unchecked")
     @Override
     public final Can<? extends Menuable> getObject() {
@@ -45,14 +51,16 @@ extends ChainingModel<Can<? extends Menuable>> {
         return getObject();
     }
 
-    public final Stream<LinkAndLabel> streamLinks() {
+    public final <T extends Menuable> Stream<T> streamMenuables(final Class<T> linkType) {
         return menuables().stream()
-                .filter(LinkAndLabel.class::isInstance)
-                .map(LinkAndLabel.class::cast);
+                //.filter(menuable->menuable.menuableKind().isLink())
+                .filter(linkType::isInstance)
+                .map(linkType::cast);
     }
 
+    //TODO[CAUSEWAY-3582] too specific
     public boolean hasAnyVisibleLink() {
-        return streamLinks().anyMatch(linkAndLabel->linkAndLabel.getUiComponent().isVisible());
+        return streamMenuables(LinkAndLabel.class).anyMatch(linkAndLabel->linkAndLabel.getUiComponent().isVisible());
     }
 
 }
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
index 4147fdc81c..c8a1548417 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
@@ -25,9 +25,8 @@ import org.apache.wicket.MarkupContainer;
 
 import org.apache.causeway.commons.collections.Can;
 import org.apache.causeway.viewer.wicket.model.links.LinkAndLabel;
-import org.apache.causeway.viewer.wicket.model.links.ListOfMenuables;
-import org.apache.causeway.viewer.wicket.model.links.Menuable;
-import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
+import org.apache.causeway.viewer.wicket.model.links.MenuablesModel;
+import org.apache.causeway.viewer.wicket.ui.components.menuable.MenuablePanelAbstract;
 import org.apache.causeway.viewer.wicket.ui.util.Wkt;
 import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
 import org.apache.causeway.viewer.wicket.ui.util.WktLinks;
@@ -35,7 +34,7 @@ import org.apache.causeway.viewer.wicket.ui.util.WktLinks;
 import lombok.val;
 
 public class AdditionalLinksPanel
-extends PanelAbstract<Can<? extends Menuable>, ListOfMenuables> {
+extends MenuablePanelAbstract {
 
     private static final long serialVersionUID = 1L;
 
@@ -72,20 +71,15 @@ extends PanelAbstract<Can<? extends Menuable>, ListOfMenuables> {
         return Wkt.add(markupContainer, style.newPanel(id, links));
     }
 
-    protected final ListOfMenuables listOfMenuables() {
-        return getModel();
-    }
-
     protected final List<LinkAndLabel> listOfLinkAndLabels() {
-        return listOfMenuables().streamLinks().collect(Collectors.toList());
+        return menuablesModel().streamMenuables(LinkAndLabel.class).collect(Collectors.toList());
     }
 
-
     protected AdditionalLinksPanel(
             final String id,
             final Can<LinkAndLabel> linksDoNotUseDirectlyInsteadUseOfListOfLinksModel) {
 
-        super(id, new ListOfMenuables(linksDoNotUseDirectlyInsteadUseOfListOfLinksModel));
+        super(id, new MenuablesModel(linksDoNotUseDirectlyInsteadUseOfListOfLinksModel));
         setOutputMarkupId(true);
 
         val container = Wkt.add(this, Wkt.containerWithVisibility(ID_ADDITIONAL_LINK_LIST,
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.java
index 41844d2294..dd117a90d4 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/CssSubMenuItemsPanel.java
@@ -22,38 +22,35 @@ import java.util.List;
 
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.repeater.RepeatingView;
-import org.apache.wicket.model.util.ListModel;
+
+import org.apache.causeway.viewer.wicket.model.links.MenuablesModel;
+import org.apache.causeway.viewer.wicket.ui.components.menuable.MenuablePanelAbstract;
+import org.apache.causeway.viewer.wicket.ui.util.Wkt;
+
+import lombok.val;
 
 /**
  * Panel containing a list of {@link CssMenuItem}s acting as submenus of a
  * parent {@link CssMenuItem}.
  */
 class CssSubMenuItemsPanel
-extends CssMenuItemPanelAbstract<List<CssMenuItem>, CssSubMenuItemsPanel.MyModel> {
+extends MenuablePanelAbstract {
 
     private static final long serialVersionUID = 1L;
 
-    static class MyModel extends ListModel<CssMenuItem> {
-
-        private static final long serialVersionUID = 1L;
-
-        public MyModel(final List<CssMenuItem> cssMenuItems) {
-            super(cssMenuItems);
-        }
-    }
-
     public CssSubMenuItemsPanel(final String id, final List<CssMenuItem> subMenuItems) {
-        super(id, new MyModel(subMenuItems));
+        super(id, new MenuablesModel(subMenuItems));
         setRenderBodyOnly(true);
 
-        final RepeatingView menuItemRv = new RepeatingView(getId());
-        add(menuItemRv);
-        for (final CssMenuItem cssMenuItem : getModel().getObject()) {
-            final WebMarkupContainer menuItemMarkup = new WebMarkupContainer(menuItemRv.newChildId());
-            menuItemRv.add(menuItemMarkup);
+        val repeatingView = Wkt.add(this, new RepeatingView(getId()));
+
+        menuablesModel().streamMenuables(CssMenuItem.class)
+        .forEach(cssMenuItem->{
+            val menuItemMarkup = new WebMarkupContainer(repeatingView.newChildId());
+            repeatingView.add(menuItemMarkup);
+            cssMenuItem.addTo(menuItemMarkup);
+        });
 
-            addSubMenuItems(menuItemMarkup, cssMenuItem);
-        }
     }
 
 }
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/_Util.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/_Util.java
index 4bca7665f5..d00b67b514 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/_Util.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/_Util.java
@@ -51,6 +51,9 @@ class _Util {
                 return cssClass;
             })
             .orElseGet(()->{
+                // Small hack: if there is no specific CSS class then we assume that background-image is used
+                // the span.ViewItemLink should have some content to show it
+                // FIX: find a way to do this with CSS (width and height don't seems to help)
                 viewIcon.setDefaultModelObject("&#160;&#160;&#160;&#160;&#160;");
                 viewIcon.setEscapeModelStrings(false);
                 return Model.of(_Strings.asLowerDashed.apply(componentFactory.getName()));
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItemPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/menuable/MenuablePanelAbstract.java
similarity index 60%
rename from viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItemPanelAbstract.java
rename to viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/menuable/MenuablePanelAbstract.java
index f98a6b9173..8a24034997 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItemPanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/menuable/MenuablePanelAbstract.java
@@ -16,29 +16,28 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.causeway.viewer.wicket.ui.components.actionmenu.serviceactions;
-
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.model.IModel;
+package org.apache.causeway.viewer.wicket.ui.components.menuable;
 
+import org.apache.causeway.commons.collections.Can;
+import org.apache.causeway.viewer.wicket.model.links.Menuable;
+import org.apache.causeway.viewer.wicket.model.links.MenuablesModel;
 import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
 
 /**
- * Package-level adapter for menu items and submenu-items.
+ * Common panel for drop-downs and sub-menus.
  */
-abstract class CssMenuItemPanelAbstract<T, M extends IModel<T>>
-extends PanelAbstract<T, M> {
+public abstract class MenuablePanelAbstract
+extends PanelAbstract<Can<? extends Menuable>, MenuablesModel> {
 
     private static final long serialVersionUID = 1L;
 
-    public CssMenuItemPanelAbstract(final String id, final M model) {
+    //TODO[CAUSEWAY-3582] give me a can instead of a model, can make the model from it
+    protected MenuablePanelAbstract(final String id, final MenuablesModel model) {
         super(id, model);
-        setRenderBodyOnly(true);
     }
 
-    protected void addSubMenuItems(final WebMarkupContainer markupContainer, final CssMenuItem cssMenuItem) {
-        cssMenuItem.addTo(markupContainer);
+    public final MenuablesModel menuablesModel() {
+        return getModel();
     }
 
-
 }