Author: abelevich Date: 2007-07-23 10:53:04 -0400 (Mon, 23 Jul 2007) New Revision: 1791 Modified: trunk/sandbox/ui/message/src/main/java/org/richfaces/renderkit/html/RichMessageHtmlBaseRenderer.java Log: add renderOuterStyle() function Modified: trunk/sandbox/ui/message/src/main/java/org/richfaces/renderkit/html/RichMessageHtmlBaseRenderer.java =================================================================== --- trunk/sandbox/ui/message/src/main/java/org/richfaces/renderkit/html/RichMessageHtmlBaseRenderer.java 2007-07-23 14:31:00 UTC (rev 1790) +++ trunk/sandbox/ui/message/src/main/java/org/richfaces/renderkit/html/RichMessageHtmlBaseRenderer.java 2007-07-23 14:53:04 UTC (rev 1791) @@ -121,6 +121,8 @@ ResponseWriter writer = context.getResponseWriter(); writer.startElement(HTML.SPAN_ELEM, uiMsg); getUtils().writeAttribute(writer, HTML.id_ATTRIBUTE, uiMsg.getClientId(context)); + + renderOuterStyle(uiMsg, context, writer, facesMsg); if(markerLocation.equals(uiMsg.MARKER_LOCATION_LEFT)){ @@ -136,6 +138,55 @@ writer.endElement(HTML.SPAN_ELEM); } + protected void renderOuterStyle(UIRichMessage uiMsg, FacesContext context, ResponseWriter writer,FacesMessage facesMsg) throws IOException{ + + String outerClass = null; + + String outerStyle = null; + + Severity severity = null; + + + if(facesMsg != null){ + + severity = facesMsg.getSeverity(); + + if(severity == FacesMessage.SEVERITY_ERROR){ + + outerClass = (String)uiMsg.getAttributes().get("errorClass"); + outerStyle = (String)uiMsg.getAttributes().get("errorStyle"); + + }else if(severity == FacesMessage.SEVERITY_FATAL){ + + outerClass = (String)uiMsg.getAttributes().get("fatalClass"); + outerStyle = (String)uiMsg.getAttributes().get("fatalStyle"); + + }else if(severity == FacesMessage.SEVERITY_WARN){ + + outerClass = (String)uiMsg.getAttributes().get("warnClass"); + outerStyle = (String)uiMsg.getAttributes().get("warnStyle"); + + }else if(severity == FacesMessage.SEVERITY_INFO){ + + outerClass = (String)uiMsg.getAttributes().get("infoClass"); + outerStyle = (String)uiMsg.getAttributes().get("infoStyle"); + } + } + + String parentStyle = (String)uiMsg.getAttributes().get("style"); + String parentClass = (String)uiMsg.getAttributes().get("styleClass"); + + String richMessageClass = "rich-message" + (null != outerClass ? (outerClass + " ") : ""); + String richMessageStyle = (null != outerStyle ? outerClass + " ," : ""); + + parentStyle = parentStyle != null ? (richMessageStyle + parentStyle) : richMessageStyle; + parentClass = parentClass != null ? (richMessageClass + parentClass) : richMessageClass; + + getUtils().writeAttribute(writer, HTML.class_ATTRIBUTE, parentClass); + getUtils().writeAttribute(writer, HTML.style_ATTRIBUTE, parentStyle); + + } + protected void renderMarkerFacet(UIRichMessage uiMsg, FacesContext context, ResponseWriter writer,FacesMessage facesMsg) throws IOException{ UIComponent marker = null; @@ -216,10 +267,6 @@ String labelStyle = null; - String outerClass = null; - - String outerStyle = null; - String passLabel = null; Severity severity = null; @@ -239,33 +286,21 @@ if(severity == FacesMessage.SEVERITY_ERROR){ - outerClass = (String)uiMsg.getAttributes().get("errorClass"); - outerStyle = (String)uiMsg.getAttributes().get("errorStyle"); - labelClass = (String)uiMsg.getAttributes().get("errorLabelClass"); labelStyle = (String)uiMsg.getAttributes().get("errorLabelStyle"); }else if(severity == FacesMessage.SEVERITY_FATAL){ - outerClass = (String)uiMsg.getAttributes().get("fatalClass"); - outerStyle = (String)uiMsg.getAttributes().get("fatalStyle"); - labelClass = (String)uiMsg.getAttributes().get("fatalLabelClass"); labelStyle = (String)uiMsg.getAttributes().get("fatalLabelStyle"); }else if(severity == FacesMessage.SEVERITY_WARN){ - outerClass = (String)uiMsg.getAttributes().get("warnClass"); - outerStyle = (String)uiMsg.getAttributes().get("warnStyle"); - labelClass = (String)uiMsg.getAttributes().get("warnLabelClass"); labelStyle = (String)uiMsg.getAttributes().get("warnLabelStyle"); }else if(severity == FacesMessage.SEVERITY_INFO){ - outerClass = (String)uiMsg.getAttributes().get("infoClass"); - outerStyle = (String)uiMsg.getAttributes().get("infoStyle"); - labelClass = (String)uiMsg.getAttributes().get("infoLabelClass"); labelStyle = (String)uiMsg.getAttributes().get("infoLabelStyle"); @@ -286,18 +321,6 @@ } - String parentStyle = (String)uiMsg.getAttributes().get("style"); - String parentClass = (String)uiMsg.getAttributes().get("styleClass"); - - String richMessageClass = "rich-message" + (null != outerClass ? (outerClass + " ") : ""); - String richMessageStyle = (null != outerStyle ? outerClass + " ," : ""); - - parentStyle = parentStyle != null ? (richMessageStyle + parentStyle) : parentStyle; - parentClass = parentClass != null ? (richMessageClass + parentClass) : parentClass; - - getUtils().writeAttribute(writer, HTML.class_ATTRIBUTE, parentClass); - getUtils().writeAttribute(writer, HTML.style_ATTRIBUTE, parentStyle); - String classes = labelClass == null ? "rich-message-label" : "rich-message-label " + labelClass; writer.startElement(HTML.SPAN_ELEM, uiMsg);