[richfaces-svn-commits] JBoss Rich Faces SVN: r5063 - trunk/ui/message/src/main/java/org/richfaces/renderkit/html and 1 other directory.
Author: sergeyhalipov
Date: 2007-12-28 07:34:21 -0500 (Fri, 28 Dec 2007)
New Revision: 5063
Modified:
branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java
trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java
Log:
http://jira.jboss.com/jira/browse/RF-1754
Modified:
branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java
===================================================================
---
branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-12-28
12:30:26 UTC (rev 5062)
+++
branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-12-28
12:34:21 UTC (rev 5063)
@@ -48,7 +48,7 @@
UIRichMessages uiMessages = (UIRichMessages)component;
- boolean isDisplayNone = (!messagesIter.hasNext() && !uiMessages.isPassed()) ?
true : false;
+ boolean isDisplayNone = !messagesIter.hasNext();
if(!isDisplayNone){
String [] levels = uiMessages.getLevel().split(",");
@@ -188,25 +188,17 @@
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 parentClass = (String)uiMessages.getAttributes().get("styleClass");
- if(displayStyle != null){
- parentStyle = (displayStyle != null) ? displayStyle + ";" + parentStyle :
parentStyle;
- }
+ parentStyle = ((isDisplayNone) ? "display: none; " : "") +
parentStyle;
String richMessageClass = "rich-messages";
parentClass = parentClass != null ? (richMessageClass + " " + parentClass) :
richMessageClass;
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-12-28
12:30:26 UTC (rev 5062)
+++
trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-12-28
12:34:21 UTC (rev 5063)
@@ -4,12 +4,9 @@
package org.richfaces.renderkit.html;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Iterator;
-import java.util.List;
import javax.faces.application.FacesMessage;
-import javax.faces.application.FacesMessage.Severity;
import javax.faces.component.UIComponent;
import javax.faces.component.UIMessages;
import javax.faces.context.FacesContext;