(empire-db) branch master updated: EMPIREDB-431 MenuItemTag: better name for facet

[doebele]

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

doebele pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/empire-db.git


The following commit(s) were added to refs/heads/master by this push:
     new a8bb32c5 EMPIREDB-431 MenuItemTag: better name for facet
a8bb32c5 is described below

commit a8bb32c57b18dfc05144e13dbb31108181491dcc
Author: Rainer Döbele <rdoeb...@users.noreply.github.com>
AuthorDate: Fri Oct 11 19:38:20 2024 +0200

    EMPIREDB-431
    MenuItemTag: better name for facet
---
 .../apache/empire/jsf2/components/MenuItemTag.java | 25 ++++++++--------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/MenuItemTag.java
 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/MenuItemTag.java
index dab39f6c..9238c7a4 100644
--- 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/MenuItemTag.java
+++ 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/MenuItemTag.java
@@ -173,19 +173,6 @@ public class MenuItemTag extends LinkTag
         ResponseWriter writer = context.getResponseWriter();
         writer.endElement("li");
     }
-    
-    /*
-    private void printChildTree(UIComponent comp, int level)
-    {
-        List<UIComponent> cl = comp.getChildren();
-        for (UIComponent c : cl)
-        {
-            boolean isRendered = c.isRendered();
-            log.info("-{}- rendering {} "+String.valueOf(isRendered), level, 
c.getClass().getSimpleName());
-            printChildTree(c, level+1);
-        }
-    }
-    */
 
     @Override
     protected String getLinkStyleClass()
@@ -313,16 +300,22 @@ public class MenuItemTag extends LinkTag
     {
         return false;
     }
+
+    
+    /* 
+     * Supports a "label" facet" e.g.
+     * <e:mitem menuId="..." page="..."><f:facet name="label"><span 
class="icon"/><label>...</label></f:facet></e:mitem>
+     */ 
     
     @Override
     protected void encodeLinkComponent(FacesContext context, 
HtmlOutcomeTargetLink linkComponent)
         throws IOException
     {
-        UIComponent linkFacet = this.getFacet("link");
-        if (linkFacet!=null)
+        UIComponent labelFacet = this.getFacet("label");
+        if (labelFacet!=null)
         {   // custom rendering
             linkComponent.encodeBegin(context);
-            linkFacet.encodeAll(context);
+            labelFacet.encodeAll(context);
             linkComponent.encodeEnd(context);
         }
         else