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 2009/05/26 21:44:19 UTC
svn commit: r778858 - in
/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html:
HtmlMessageRendererBase.java HtmlMessagesRendererBase.java
Author: lu4242
Date: Tue May 26 19:44:18 2009
New Revision: 778858
URL: http://svn.apache.org/viewvc?rev=778858&view=rev
Log:
MYFACES-2139 h:messages don't use styleClass attribute when rendering and TOMAHAWK-1082 t:messages does not put the class (error, info, fatal) to the li item when layout is "list" (render style - styleClass on <li> or <td> rather than <span>)
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=778858&r1=778857&r2=778858&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 Tue May 26 19:44:18 2009
@@ -117,12 +117,23 @@
{
renderSingleFacesMessage(facesContext, message, facesMessage, messageClientId,true);
}
+
+ protected void renderSingleFacesMessage(FacesContext facesContext,
+ UIComponent message,
+ FacesMessage facesMessage,
+ String messageClientId,
+ boolean renderId)
+ throws IOException
+ {
+ renderSingleFacesMessage(facesContext, message, facesMessage, messageClientId, renderId, true);
+ }
protected void renderSingleFacesMessage(FacesContext facesContext,
UIComponent message,
FacesMessage facesMessage,
String messageClientId,
- boolean renderId)
+ boolean renderId,
+ boolean renderStyleAndStyleClass)
throws IOException
{
// determine style and style class
@@ -166,8 +177,11 @@
}
span |= HtmlRendererUtils.renderHTMLAttributeWithOptionalStartElement(writer, message, HTML.SPAN_ELEM, HTML.TITLE_ATTR, title, span);
- span |= HtmlRendererUtils.renderHTMLAttributeWithOptionalStartElement(writer, message, HTML.SPAN_ELEM, HTML.STYLE_ATTR, style, span);
- span |= HtmlRendererUtils.renderHTMLAttributeWithOptionalStartElement(writer, message, HTML.SPAN_ELEM, HTML.STYLE_CLASS_ATTR, styleClass, span);
+ if (renderStyleAndStyleClass)
+ {
+ span |= HtmlRendererUtils.renderHTMLAttributeWithOptionalStartElement(writer, message, HTML.SPAN_ELEM, HTML.STYLE_ATTR, style, span);
+ span |= HtmlRendererUtils.renderHTMLAttributeWithOptionalStartElement(writer, message, HTML.SPAN_ELEM, HTML.STYLE_CLASS_ATTR, styleClass, span);
+ }
boolean showSummary = isShowSummary(message) && (summary != null);
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=778858&r1=778857&r2=778858&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 Tue May 26 19:44:18 2009
@@ -95,10 +95,20 @@
while(messagesIterator.hasNext())
{
writer.startElement(org.apache.myfaces.shared.renderkit.html.HTML.LI_ELEM, messages);
+
+ FacesMessage facesMessage = (FacesMessage)messagesIterator.next();
+ // determine style and style class
+ String[] styleAndClass = getStyleAndStyleClass(messages, facesMessage.getSeverity());
+ String style = styleAndClass[0];
+ String styleClass = styleAndClass[1];
+
+ HtmlRendererUtils.renderHTMLAttribute(writer, HTML.STYLE_ATTR, HTML.STYLE_ATTR, style);
+ HtmlRendererUtils.renderHTMLAttribute(writer, HTML.STYLE_CLASS_ATTR, HTML.STYLE_CLASS_ATTR, styleClass);
+
renderSingleFacesMessage(facesContext,
messages,
- (FacesMessage)messagesIterator.next(),
- messagesIterator.getClientId(),false);
+ facesMessage,
+ messagesIterator.getClientId(),false,false);
writer.endElement(HTML.LI_ELEM);
}
@@ -121,10 +131,20 @@
{
writer.startElement(HTML.TR_ELEM, messages);
writer.startElement(HTML.TD_ELEM, messages);
+
+ FacesMessage facesMessage = (FacesMessage)messagesIterator.next();
+ // determine style and style class
+ String[] styleAndClass = getStyleAndStyleClass(messages, facesMessage.getSeverity());
+ String style = styleAndClass[0];
+ String styleClass = styleAndClass[1];
+
+ HtmlRendererUtils.renderHTMLAttribute(writer, HTML.STYLE_ATTR, HTML.STYLE_ATTR, style);
+ HtmlRendererUtils.renderHTMLAttribute(writer, HTML.STYLE_CLASS_ATTR, HTML.STYLE_CLASS_ATTR, styleClass);
+
renderSingleFacesMessage(facesContext,
messages,
- (FacesMessage)messagesIterator.next(),
- messagesIterator.getClientId(),false);
+ facesMessage,
+ messagesIterator.getClientId(),false,false);
writer.endElement(HTML.TD_ELEM);
writer.endElement(HTML.TR_ELEM);