[richfaces-svn-commits] JBoss Rich Faces SVN: r2980 - trunk/ui/message/src/main/java/org/richfaces/renderkit/html.
Author: abelevich
Date: 2007-09-18 10:56:27 -0400 (Tue, 18 Sep 2007)
New Revision: 2980
Modified:
trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java
Log:
fix RF-956, render display: none style in renderOuterStyle function
Modified:
trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java
===================================================================
---
trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-09-18
14:54:09 UTC (rev 2979)
+++
trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-09-18
14:56:27 UTC (rev 2980)
@@ -98,6 +98,8 @@
UIRichMessages uiMessages = (UIRichMessages)component;
+
+ boolean isDisplayNone = (!messagesIter.hasNext() && !uiMessages.isPassed()) ?
true : false;
layout = (String)uiMessages.getAttributes().get("layout");
if((layout != null) && (layout.equals("table"))){
@@ -108,9 +110,11 @@
getUtils().writeAttribute(writer, HTML.cellpadding_ATTRIBUTE, "0");
getUtils().writeAttribute(writer, HTML.cellspacing_ATTRIBUTE, "0");
-
- renderComponentOuterStyles(uiMessages, context, writer);
+
+
+ renderComponentOuterStyles(uiMessages, context, writer, isDisplayNone);
+
writer.startElement("tbody", uiMessages);
isWroteTable = true;
@@ -123,14 +127,14 @@
getUtils().writeAttribute(writer,HTML.id_ATTRIBUTE ,uiMessages.getClientId(context));
- renderComponentOuterStyles(uiMessages, context, writer);
+ renderComponentOuterStyles(uiMessages, context, writer, isDisplayNone);
}
if(!messagesIter.hasNext()){
renderBody(uiMessages, context, writer, null);
}else{
-
+
while(messagesIter.hasNext()){
FacesMessage facesMsg = (FacesMessage)(messagesIter.next());
renderBody(uiMessages, context, writer, facesMsg);
@@ -242,26 +246,35 @@
}
- public void renderComponentOuterStyles(UIComponent component, FacesContext context,
ResponseWriter writer) throws IOException {
+ public void renderComponentOuterStyles(UIComponent component, FacesContext context,
ResponseWriter writer, boolean isDisplayNone) throws IOException {
UIRichMessages uiMessages = null;
+ String displayStyle = null;
+
if(!(component instanceof UIRichMessages)){
return;
}
uiMessages = (UIRichMessages)component;
+
+ if(isDisplayNone){
+ displayStyle = "display: none";
+ }
- String parentStyle = (String)uiMessages.getAttributes().get("style");
+ String parentStyle = (String)uiMessages.getAttributes().get("style");
String parentClass = (String)uiMessages.getAttributes().get("styleClass");
-
+
+ if(displayStyle != null){
+ parentStyle = (displayStyle != null) ? displayStyle + ";" + parentStyle :
parentStyle;
+ }
+
String richMessageClass = "rich-messages";
-
parentClass = parentClass != null ? (richMessageClass + " " + parentClass) :
richMessageClass;
getUtils().writeAttribute(writer, HTML.class_ATTRIBUTE, parentClass);
getUtils().writeAttribute(writer, HTML.style_ATTRIBUTE, parentStyle);
-
+
}
public void renderOuterStyles(UIComponent component, FacesContext context,
ResponseWriter writer,