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 2008/08/04 20:40:47 UTC
svn commit: r682455 - in
/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html:
HtmlMessageRendererBase.java HtmlMessagesRendererBase.java
Author: lu4242
Date: Mon Aug 4 11:40:47 2008
New Revision: 682455
URL: http://svn.apache.org/viewvc?rev=682455&view=rev
Log:
MYFACES-1762 h:messages - error while rendering id and styleClass attributes
Modified:
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java
Modified: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java?rev=682455&r1=682454&r2=682455&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java (original)
+++ myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java Mon Aug 4 11:40:47 2008
@@ -115,6 +115,16 @@
String messageClientId)
throws IOException
{
+ renderSingleFacesMessage(facesContext, message, facesMessage, messageClientId,true);
+ }
+
+ protected void renderSingleFacesMessage(FacesContext facesContext,
+ UIComponent message,
+ FacesMessage facesMessage,
+ String messageClientId,
+ boolean renderId)
+ throws IOException
+ {
// determine style and style class
String[] styleAndClass = HtmlMessageRendererBase.getStyleAndStyleClass(message, facesMessage.getSeverity());
String style = styleAndClass[0];
@@ -142,7 +152,10 @@
writer.startElement(HTML.SPAN_ELEM, message);
- HtmlRendererUtils.writeIdIfNecessary(writer, message, facesContext);
+ if (renderId)
+ {
+ HtmlRendererUtils.writeIdIfNecessary(writer, message, facesContext);
+ }
HtmlRendererUtils.renderHTMLAttributes(writer, message, HTML.MESSAGE_PASSTHROUGH_ATTRIBUTES_WITHOUT_TITLE_STYLE_AND_STYLE_CLASS);
}
Modified: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java?rev=682455&r1=682454&r2=682455&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java (original)
+++ myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java Mon Aug 4 11:40:47 2008
@@ -98,7 +98,7 @@
renderSingleFacesMessage(facesContext,
messages,
(FacesMessage)messagesIterator.next(),
- messagesIterator.getClientId());
+ messagesIterator.getClientId(),false);
writer.endElement(HTML.LI_ELEM);
}
@@ -124,7 +124,7 @@
renderSingleFacesMessage(facesContext,
messages,
(FacesMessage)messagesIterator.next(),
- messagesIterator.getClientId());
+ messagesIterator.getClientId(),false);
writer.endElement(HTML.TD_ELEM);
writer.endElement(HTML.TR_ELEM);