You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mk...@apache.org on 2021/03/26 20:49:09 UTC

svn commit: r1888099 - in /myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/renderkit/html/ext: HtmlMessageRenderer.java HtmlMessagesRenderer.java

Author: mkienenb
Date: Fri Mar 26 20:49:09 2021
New Revision: 1888099

URL: http://svn.apache.org/viewvc?rev=1888099&view=rev
Log:
TOMAHAWK-1689 Fix t:message(s) replaceIdWithLabel for components inside
UIData elements.

Modified:
    myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlMessageRenderer.java
    myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlMessagesRenderer.java

Modified: myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlMessageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlMessageRenderer.java?rev=1888099&r1=1888098&r2=1888099&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlMessageRenderer.java (original)
+++ myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlMessageRenderer.java Fri Mar 26 20:49:09 2021
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Map;
 
 import javax.faces.application.FacesMessage;
+import javax.faces.component.ContextCallback;
 import javax.faces.component.NamingContainer;
 import javax.faces.component.UIColumn;
 import javax.faces.component.UIComponent;
@@ -34,6 +35,9 @@ import javax.faces.component.behavior.Cl
 import javax.faces.component.behavior.ClientBehaviorHolder;
 import javax.faces.component.html.HtmlOutputLabel;
 import javax.faces.component.html.HtmlOutputText;
+import javax.faces.component.visit.VisitCallback;
+import javax.faces.component.visit.VisitContext;
+import javax.faces.component.visit.VisitResult;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 
@@ -134,8 +138,10 @@ public class HtmlMessageRenderer
 
         if(((message instanceof HtmlMessages && ((HtmlMessages) message).isReplaceIdWithLabel()) ||
                 (message instanceof HtmlMessage && ((HtmlMessage) message).isReplaceIdWithLabel()))&&
-                inputLabel.length()!=0)
+                inputLabel.length()!=0) {
             msgSummary = msgSummary.replaceAll(findInputId(facesContext, msgClientId),inputLabel);
+            msgSummary = msgSummary.replaceAll(msgClientId,inputLabel);
+        }
 
 
         String summaryFormat;
@@ -169,8 +175,10 @@ public class HtmlMessageRenderer
 
         if(((message instanceof HtmlMessages && ((HtmlMessages) message).isReplaceIdWithLabel()) ||
                 (message instanceof HtmlMessage && ((HtmlMessage) message).isReplaceIdWithLabel()))&&
-                inputLabel.length()!=0)
+                inputLabel.length()!=0) {
             msgDetail = msgDetail.replaceAll(findInputId(facesContext, msgClientId),inputLabel);
+            msgDetail = msgDetail.replaceAll(msgClientId,inputLabel);
+        }
 
         String detailFormat;
         if (message instanceof HtmlMessage)
@@ -188,6 +196,22 @@ public class HtmlMessageRenderer
         return format.format(new Object[] {msgDetail, inputLabel});
     }
 
+    static private class FindComponentByClientIdContextCallback implements ContextCallback {
+        private UIComponent foundComponent = null;
+        public void invokeContextCallback(FacesContext context, UIComponent component) {
+            foundComponent = component;
+        }
+        
+        public UIComponent getFoundComponent() {
+            return foundComponent;
+        }
+    }
+    
+    private static UIComponent doFind(FacesContext context, String clientId) {
+        FindComponentByClientIdContextCallback findComponentByClientIdContextCallback = new FindComponentByClientIdContextCallback();
+        context.getViewRoot().invokeOnComponent(context, clientId, findComponentByClientIdContextCallback);
+        return findComponentByClientIdContextCallback.getFoundComponent();
+    }
 
     public static String findInputLabel(FacesContext facesContext, String inputClientId)
     {
@@ -196,7 +220,7 @@ public class HtmlMessageRenderer
 
         if(info == null)
         {
-            UIComponent comp = facesContext.getViewRoot().findComponent(inputClientId);
+            UIComponent comp = doFind(facesContext, inputClientId);
 
             UIComponent parent=comp;
 
@@ -266,9 +290,51 @@ public class HtmlMessageRenderer
         return map;
     }
 
-    private static void createOutputLabelMap(FacesContext facesContext,
+    private static void createOutputLabelMap(final FacesContext facesContext,
+                                             UIComponent root,
+                                             final Map<String, MessageLabelInfo> map)
+    {
+        root.visitTree(VisitContext.createVisitContext(facesContext), new VisitCallback() {
+            @Override
+            public VisitResult visit(VisitContext context, UIComponent component) {
+                if (component instanceof HtmlOutputLabel) {
+                    String forAttr = ((HtmlOutputLabel)component).getFor();
+                    if (forAttr != null)
+                    {
+                        UIComponent input = component.findComponent(forAttr);
+                        if (input == null)
+                        {
+                            log.warn("Unable to find component '" + forAttr + "' (calling findComponent on component '" + component.getClientId(facesContext) + "')");
+                        }
+                        else
+                        {
+                            if (component.getValueExpression("value") == null)
+                            {
+                                // If the child uses a ValueExpression, do not evaluate the text
+                                // right now. When getText(FacesContext) is called, do it there.
+                                map.put(input.getClientId(facesContext),
+                                        new MessageDefferedLabelInfo(
+                                                input, component));                            
+                            }
+                            else
+                            {
+                                map.put(input.getClientId(facesContext),
+                                        new MessageTextLabelInfo(
+                                                input,getComponentText(facesContext, (HtmlOutputLabel)component)));
+                            }
+                        }
+                    }
+                }
+                return VisitResult.ACCEPT;
+            }
+        });
+
+        createOutputLabelMapIgnoringUiDataIndexes(facesContext, facesContext.getViewRoot(), map);
+    }
+
+    private static void createOutputLabelMapIgnoringUiDataIndexes(final FacesContext facesContext,
                                              UIComponent root,
-                                             Map<String, MessageLabelInfo> map)
+                                             final Map<String, MessageLabelInfo> map)
     {
         for (Iterator<UIComponent> it = root.getFacetsAndChildren(); it.hasNext(); )
         {
@@ -304,7 +370,7 @@ public class HtmlMessageRenderer
             }
             else
             {
-                createOutputLabelMap(facesContext, child, map);
+                createOutputLabelMapIgnoringUiDataIndexes(facesContext, child, map);
             }
         }
     }

Modified: myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlMessagesRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlMessagesRenderer.java?rev=1888099&r1=1888098&r2=1888099&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlMessagesRenderer.java (original)
+++ myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlMessagesRenderer.java Fri Mar 26 20:49:09 2021
@@ -114,8 +114,10 @@ public class HtmlMessagesRenderer
 
         if(((message instanceof HtmlMessages && ((HtmlMessages) message).isReplaceIdWithLabel()) ||
                 (message instanceof HtmlMessage && ((HtmlMessage) message).isReplaceIdWithLabel()))&&
-                inputLabel.length()!=0)
+                inputLabel.length()!=0) {
             msgSummary = msgSummary.replaceAll(HtmlMessageRenderer.findInputId(facesContext, msgClientId),inputLabel);
+            msgSummary = msgSummary.replaceAll(msgClientId,inputLabel);
+        }
 
 
         String summaryFormat;
@@ -176,8 +178,10 @@ public class HtmlMessagesRenderer
 
         if(((message instanceof HtmlMessages && ((HtmlMessages) message).isReplaceIdWithLabel()) ||
                 (message instanceof HtmlMessage && ((HtmlMessage) message).isReplaceIdWithLabel()))&&
-                inputLabel.length()!=0)
+                inputLabel.length()!=0) {
             msgDetail = msgDetail.replaceAll(HtmlMessageRenderer.findInputId(facesContext, msgClientId),inputLabel);
+            msgDetail = msgDetail.replaceAll(msgClientId,inputLabel);
+        }
 
         String detailFormat;
         if (message instanceof HtmlMessage)