You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ba...@apache.org on 2010/03/16 18:54:56 UTC

svn commit: r923903 - /myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java

Author: baranda
Date: Tue Mar 16 17:54:56 2010
New Revision: 923903

URL: http://svn.apache.org/viewvc?rev=923903&view=rev
Log:
[MYFACES-2610] h:link not being rendered correctly when disabled - no value shown

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

Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java?rev=923903&r1=923902&r2=923903&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java Tue Mar 16 17:54:56 2010
@@ -764,6 +764,13 @@ public abstract class HtmlLinkRendererBa
                 HtmlRendererUtils.writeIdIfNecessary(writer, output, facesContext);
                 HtmlRendererUtils.renderHTMLAttributes(writer, output, HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES);
             }
+
+            Object value = output.getValue();
+
+            if(value != null)
+            {
+                writer.writeText(value.toString(), JSFAttr.VALUE_ATTR);
+            }
         }
         else
         {
@@ -791,6 +798,7 @@ public abstract class HtmlLinkRendererBa
                 HtmlRendererUtils.writeIdAndNameIfNecessary(writer, output, facesContext);
                 HtmlRendererUtils.renderHTMLAttributes(writer, output, HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES);
             }
+
             writer.flush();
         }
     }