Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

initial mvc message display

Browse Source
This commit is contained in:
Keith Donald
2008-04-01 18:50:56 +00:00
parent bc35b3d8a6
commit e9f070b3e3
10 changed files with 169 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java
View File

@@ -119,7 +119,7 @@ public class FlowFacesContext extends FacesContext {
* associated with any specific UIComponent. If no such messages have been queued, return null.
*/
public FacesMessage.Severity getMaximumSeverity() {
if (context.getMessageContext().getMessages().length == 0) {
if (context.getMessageContext().getAllMessages().length == 0) {
return null;
}
FacesMessage.Severity max = FacesMessage.SEVERITY_INFO;
@@ -241,11 +241,11 @@ public class FlowFacesContext extends FacesContext {
private int currentIndex = -1;
protected FacesMessageIterator() {
this.messages = context.getMessageContext().getMessages();
this.messages = context.getMessageContext().getAllMessages();
}
protected FacesMessageIterator(String clientId) {
this.messages = context.getMessageContext().getMessages(clientId);
this.messages = context.getMessageContext().getMessagesBySource(clientId);
}
public boolean hasNext() {
@@ -282,7 +282,7 @@ public class FlowFacesContext extends FacesContext {
int currentIndex = -1;
protected ClientIdIterator() {
this.messages = context.getMessageContext().getMessages();
this.messages = context.getMessageContext().getAllMessages();
}
public boolean hasNext() {

23
spring-faces/src/test/java/org/springframework/faces/webflow/FlowFacesContextTests.java
View File

@@ -1,7 +1,5 @@
package org.springframework.faces.webflow;
import org.easymock.EasyMock;
import java.util.Iterator;
import javax.faces.application.FacesMessage;
@@ -9,8 +7,10 @@ import javax.faces.context.FacesContext;
import junit.framework.TestCase;
import org.easymock.EasyMock;
import org.springframework.binding.message.Message;
import org.springframework.binding.message.MessageContext;
import org.springframework.binding.message.MessageCriteria;
import org.springframework.binding.message.MessageResolver;
import org.springframework.binding.message.Severity;
import org.springframework.webflow.execution.RequestContext;
@@ -106,17 +106,19 @@ public class FlowFacesContextTests extends TestCase {
messageCount++;
}
public Message[] getMessages() {
public Message[] getAllMessages() {
return null;
}
public Message[] getMessages(Object source) {
// TODO Auto-generated method stub
public Message[] getMessagesBySource(Object source) {
throw new UnsupportedOperationException("Auto-generated method stub");
}
public Message[] getMessagesByCriteria(MessageCriteria criteria) {
throw new UnsupportedOperationException("Auto-generated method stub");
}
public void clearMessages() {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Auto-generated method stub");
}
}
@@ -136,16 +138,19 @@ public class FlowFacesContextTests extends TestCase {
}
public Message[] getMessages() {
public Message[] getAllMessages() {
return messages;
}
public Message[] getMessages(Object source) {
public Message[] getMessagesBySource(Object source) {
return new Message[] { messages[1] };
}
public Message[] getMessagesByCriteria(MessageCriteria criteria) {
throw new UnsupportedOperationException("Auto-generated method stub");
}
public void clearMessages() {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Auto-generated method stub");
}