You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gr...@apache.org on 2005/07/06 20:32:44 UTC
svn commit: r209490 -
/myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlMessagesRendererBase.java
Author: grantsmith
Date: Wed Jul 6 11:32:42 2005
New Revision: 209490
URL: http://svn.apache.org/viewcvs?rev=209490&view=rev
Log:
MYFACES-304 (continued): HtmlMessagesRendererBase renders global messages twice when globalOnly is false.
Modified:
myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlMessagesRendererBase.java
Modified: myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlMessagesRendererBase.java
URL: http://svn.apache.org/viewcvs/myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlMessagesRendererBase.java?rev=209490&r1=209489&r2=209490&view=diff
==============================================================================
--- myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlMessagesRendererBase.java (original)
+++ myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlMessagesRendererBase.java Wed Jul 6 11:32:42 2005
@@ -49,7 +49,7 @@
throws IOException
{
MessagesIterator messagesIterator = new MessagesIterator(facesContext,
- isGlobalOnly(messages));
+ isGlobalOnly(messages));
if (messagesIterator.hasNext())
{
@@ -92,9 +92,9 @@
{
writer.startElement(HTML.LI_ELEM, messages);
renderSingleFacesMessage(facesContext,
- messages,
- (FacesMessage)messagesIterator.next(),
- messagesIterator.getClientId());
+ messages,
+ (FacesMessage)messagesIterator.next(),
+ messagesIterator.getClientId());
writer.endElement(HTML.LI_ELEM);
}
@@ -117,9 +117,9 @@
writer.startElement(HTML.TR_ELEM, messages);
writer.startElement(HTML.TD_ELEM, messages);
renderSingleFacesMessage(facesContext,
- messages,
- (FacesMessage)messagesIterator.next(),
- messagesIterator.getClientId());
+ messages,
+ (FacesMessage)messagesIterator.next(),
+ messagesIterator.getClientId());
writer.endElement(HTML.TD_ELEM);
writer.endElement(HTML.TR_ELEM);
@@ -291,13 +291,14 @@
public MessagesIterator(FacesContext facesContext, boolean globalOnly)
{
_facesContext = facesContext;
- _globalMessagesIterator = facesContext.getMessages(null);
if (globalOnly)
{
+ _globalMessagesIterator = facesContext.getMessages(null);
_clientIdsWithMessagesIterator = NullIterator.instance();
}
else
{
+ _globalMessagesIterator = NullIterator.instance();
_clientIdsWithMessagesIterator = facesContext.getClientIdsWithMessages();
}
_componentMessagesIterator = null;
@@ -307,8 +308,8 @@
public boolean hasNext()
{
return _globalMessagesIterator.hasNext() ||
- _clientIdsWithMessagesIterator.hasNext() ||
- (_componentMessagesIterator != null && _componentMessagesIterator.hasNext());
+ _clientIdsWithMessagesIterator.hasNext() ||
+ (_componentMessagesIterator != null && _componentMessagesIterator.hasNext());
}
public Object next()