You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2012/02/27 04:53:22 UTC
svn commit: r1294015 - /myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java

Author: lu4242
Date: Mon Feb 27 03:53:22 2012
New Revision: 1294015

URL: http://svn.apache.org/viewvc?rev=1294015&view=rev
Log:
MYFACES-3479 [perf] Remove END_LINK_OUTCOME_AS_SPAN from HtmlLinkRendererBase

Modified:
    myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java

Modified: myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java?rev=1294015&r1=1294014&r2=1294015&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java (original)
+++ myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java Mon Feb 27 03:53:22 2012
@@ -66,7 +66,7 @@ public abstract class HtmlLinkRendererBa
     //private static final Log log = LogFactory.getLog(HtmlLinkRenderer.class);
     
     public static final String END_LINK_OUTCOME_AS_SPAN = 
-        "org.apache.myfaces.shared.HtmlLinkRendererBase.END_LINK_OUTCOME_AS_SPAN";
+        "oam.shared.HtmlLinkRendererBase.END_LINK_OUTCOME_AS_SPAN";
 
     public boolean getRendersChildren()
     {
@@ -1024,7 +1024,10 @@ public abstract class HtmlLinkRendererBa
         
         if (HtmlRendererUtils.isDisabled(output) || targetHref == null)
         {
-            output.getAttributes().put(END_LINK_OUTCOME_AS_SPAN, Boolean.TRUE);
+            //output.getAttributes().put(END_LINK_OUTCOME_AS_SPAN, Boolean.TRUE);
+            //Note one h:link cannot have a nested h:link as a child, so it is safe
+            //to just put this flag on FacesContext attribute map
+            facesContext.getAttributes().put(END_LINK_OUTCOME_AS_SPAN, Boolean.TRUE);
             writer.startElement(HTML.SPAN_ELEM, output);
             if (output instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
                     facesContext.getExternalContext()))
@@ -1238,10 +1241,11 @@ public abstract class HtmlLinkRendererBa
     {
         ResponseWriter writer = facesContext.getResponseWriter();
         
-        if (HtmlRendererUtils.isDisabled(component) || component.getAttributes().remove(
-                END_LINK_OUTCOME_AS_SPAN) != null)
+        if (HtmlRendererUtils.isDisabled(component) || Boolean.TRUE.equals(
+                facesContext.getAttributes().get(END_LINK_OUTCOME_AS_SPAN)))
         {
             writer.endElement(HTML.SPAN_ELEM);
+            facesContext.getAttributes().put(END_LINK_OUTCOME_AS_SPAN, Boolean.FALSE);
         }
         else
         {