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 2007/05/22 00:13:06 UTC
svn commit: r540319 - in
/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html:
HtmlLinkRendererBase.java HtmlRendererUtils.java
Author: baranda
Date: Mon May 21 15:13:05 2007
New Revision: 540319
URL: http://svn.apache.org/viewvc?view=rev&rev=540319
Log:
MYFACES-1638 (Do not render id and name attributes in links, if id is not specified)
Modified:
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java?view=diff&rev=540319&r1=540318&r2=540319
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java Mon May 21 15:13:05 2007
@@ -26,8 +26,8 @@
import javax.faces.application.ViewHandler;
import javax.faces.component.UICommand;
import javax.faces.component.UIComponent;
-import javax.faces.component.UIParameter;
import javax.faces.component.UIOutput;
+import javax.faces.component.UIParameter;
import javax.faces.component.html.HtmlCommandLink;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
@@ -168,7 +168,7 @@
if (HtmlRendererUtils.isDisabled(component))
{
writer.startElement(HTML.SPAN_ELEM, component);
- writer.writeAttribute(HTML.ID_ATTR, clientId, null);
+ HtmlRendererUtils.writeIdIfNecessary(writer, clientId);
HtmlRendererUtils.renderHTMLAttributes(writer, component, HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES);
}
else
@@ -185,7 +185,7 @@
anchorAttrsToRender = HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_STYLE;
}
- writer.writeAttribute(HTML.ID_ATTR, clientId, null);
+ HtmlRendererUtils.writeIdIfNecessary(writer, clientId);
HtmlRendererUtils.renderHTMLAttributes(writer, component,
anchorAttrsToRender);
HtmlRendererUtils.renderHTMLAttribute(writer, HTML.STYLE_ATTR, HTML.STYLE_ATTR,
@@ -412,8 +412,7 @@
//write anchor
writer.startElement(HTML.ANCHOR_ELEM, output);
- writer.writeAttribute(HTML.ID_ATTR, clientId, null);
- writer.writeAttribute(HTML.NAME_ATTR, clientId, null);
+ HtmlRendererUtils.writeIdAndNameIfNecessary(writer, clientId);
writer.writeURIAttribute(HTML.HREF_ATTR, href, null);
HtmlRendererUtils.renderHTMLAttributes(writer, output, org.apache.myfaces.shared.renderkit.html.HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES);
writer.flush();
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java?view=diff&rev=540319&r1=540318&r2=540319
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java Mon May 21 15:13:05 2007
@@ -612,9 +612,28 @@
FacesContext facesContext)
throws IOException
{
- if(component.getId()!=null && !component.getId().startsWith(UIViewRoot.UNIQUE_ID_PREFIX))
+ if(component.getId()!=null)
{
- writer.writeAttribute(HTML.ID_ATTR, component.getClientId(facesContext),null);
+ writeIdIfNecessary(writer, component.getClientId(facesContext));
+ }
+ }
+
+ public static void writeIdIfNecessary(ResponseWriter writer, String clientId)
+ throws IOException
+ {
+ if(clientId!=null && !clientId.startsWith(UIViewRoot.UNIQUE_ID_PREFIX))
+ {
+ writer.writeAttribute(HTML.ID_ATTR, clientId,null);
+ }
+ }
+
+ public static void writeIdAndNameIfNecessary(ResponseWriter writer, String clientId)
+ throws IOException
+ {
+ if(clientId!=null && !clientId.startsWith(UIViewRoot.UNIQUE_ID_PREFIX))
+ {
+ writer.writeAttribute(HTML.ID_ATTR, clientId,null);
+ writer.writeAttribute(HTML.NAME_ATTR, clientId, null);
}
}