[richfaces-svn-commits] JBoss Rich Faces SVN: r13782 - trunk/ui/message/src/main/java/org/richfaces/renderkit/html.

[richfaces-svn-commits at lists.jboss.org]

Author: nbelaevski
Date: 2009-04-22 15:45:29 -0400 (Wed, 22 Apr 2009)
New Revision: 13782

Modified:
   trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java
Log:
https://jira.jboss.org/jira/browse/RF-6828

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	2009-04-22 19:15:28 UTC (rev 13781)
+++ trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java	2009-04-22 19:45:29 UTC (rev 13782)
@@ -22,7 +22,6 @@
 
 import java.io.IOException;
 import java.util.Iterator;
-import java.util.List;
 
 import javax.faces.FacesException;
 import javax.faces.application.FacesMessage;
@@ -74,7 +73,7 @@
 		}else if((layout != null) && (layout.equals("list"))){
 			
 			isWroteTable = false;
-			writer.startElement("dl", uiMessages);
+			writer.startElement(HTML.DL_ELEMENT, uiMessages);
 			getUtils().writeAttribute(writer,HTML.id_ATTRIBUTE ,uiMessages.getClientId(context));
 			renderComponentOuterStyles(uiMessages, context, writer, isDisplayNone);
 		
@@ -97,7 +96,7 @@
 			writer.endElement("tbody");
 			writer.endElement("table");
 		}else{
-			writer.endElement("dl");
+			writer.endElement(HTML.DL_ELEMENT);
 		}
 	}
 	
@@ -195,7 +194,7 @@
 		String parentStyle = (String)uiMessages.getAttributes().get("style");
 		String parentClass = (String)uiMessages.getAttributes().get("styleClass");
 		
-		parentStyle = ((isDisplayNone) ? "display: none; " : "") + parentStyle;
+		parentStyle = ((isDisplayNone) ? "display: none; " : "") + (parentStyle != null ? parentStyle : "");
 		
 		String richMessageClass = "rich-messages";
 		parentClass = parentClass != null ? (richMessageClass + " " + parentClass) : richMessageClass;    
@@ -217,27 +216,25 @@
 	}
 	
 	public void renderBody(UIRichMessages uiMessages, FacesContext context, ResponseWriter writer,FacesMessage facesMsg,boolean isWroteTable) throws IOException{
+		if (isWroteTable) {
+			writer.startElement(HTML.TR_ELEMENT, uiMessages);
+			writer.startElement(HTML.td_ELEM, uiMessages);
+		} else {
+			writer.startElement(HTML.DT_ELEMENT, uiMessages);
+		}
+
+		if (facesMsg != null) {		
+			outerStyles(uiMessages, context, writer, facesMsg);
+			renderMarkerFacet(uiMessages, context, writer, facesMsg);	
+			renderLabel(uiMessages, context, writer, facesMsg);
+		}
 		
-		if(facesMsg != null ){		
-				if(isWroteTable){
-					writer.startElement(HTML.TR_ELEMENT, uiMessages);
-					writer.startElement(HTML.td_ELEM, uiMessages);
-				}else{
-					writer.startElement("dt", uiMessages);
-				}
-			
-				outerStyles(uiMessages, context, writer, facesMsg);
-				renderMarkerFacet(uiMessages, context, writer, facesMsg);	
-				renderLabel(uiMessages, context, writer, facesMsg);
-				
-				if(isWroteTable){
-					writer.endElement(HTML.td_ELEM);
-					writer.endElement(HTML.TR_ELEMENT);
-				}else{
-					writer.endElement("dt");
-				}
-			}		
-	
+		if (isWroteTable) {
+			writer.endElement(HTML.td_ELEM);
+			writer.endElement(HTML.TR_ELEMENT);
+		} else {
+			writer.endElement(HTML.DT_ELEMENT);
+		}
 	}
 	
 	protected Class<? extends UIComponent> getComponentClass() {