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

SWF-752 - FacesMessage.SEVERITY_FATAL does not propagate through FlowFacesContext

Browse Source
This commit is contained in:
Jeremy Grelle
2008-07-02 15:43:22 +00:00
parent 119384783b
commit 6982e0ac2d
5 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,9 +120,12 @@ public class FlowFacesContext extends FacesContext {
} else if (message.getSeverity() == FacesMessage.SEVERITY_WARN) {
summaryResolver = new MessageBuilder().source(summarySource).defaultText(summaryText.toString()).warning()
.build();
} else {
} else if (message.getSeverity() == FacesMessage.SEVERITY_ERROR) {
summaryResolver = new MessageBuilder().source(summarySource).defaultText(summaryText.toString()).error()
.build();
} else {
summaryResolver = new MessageBuilder().source(summarySource).defaultText(summaryText.toString()).fatal()
.build();
}
context.getMessageContext().addMessage(summaryResolver);
@@ -138,9 +141,12 @@ public class FlowFacesContext extends FacesContext {
} else if (message.getSeverity() == FacesMessage.SEVERITY_WARN) {
detailResolver = new MessageBuilder().source(detailSource).defaultText(detailText.toString()).warning()
.build();
} else {
} else if (message.getSeverity() == FacesMessage.SEVERITY_ERROR) {
detailResolver = new MessageBuilder().source(detailSource).defaultText(detailText.toString()).error()
.build();
} else {
detailResolver = new MessageBuilder().source(detailSource).defaultText(detailText.toString()).fatal()
.build();
}
context.getMessageContext().addMessage(detailResolver);
@@ -168,7 +174,7 @@ public class FlowFacesContext extends FacesContext {
if (message.getSeverity().getOrdinal() > max.getOrdinal()) {
max = message.getSeverity();
}
if (max.getOrdinal() == FacesMessage.SEVERITY_ERROR.getOrdinal())
if (max.getOrdinal() == FacesMessage.SEVERITY_FATAL.getOrdinal())
break;
}
return max;
@@ -281,8 +287,10 @@ public class FlowFacesContext extends FacesContext {
return new FacesMessage(FacesMessage.SEVERITY_INFO, summaryMessage.getText(), detailMessage.getText());
} else if (summaryMessage.getSeverity() == Severity.WARNING) {
return new FacesMessage(FacesMessage.SEVERITY_WARN, summaryMessage.getText(), detailMessage.getText());
} else {
} else if (summaryMessage.getSeverity() == Severity.ERROR) {
return new FacesMessage(FacesMessage.SEVERITY_ERROR, summaryMessage.getText(), detailMessage.getText());
} else {
return new FacesMessage(FacesMessage.SEVERITY_FATAL, summaryMessage.getText(), detailMessage.getText());
}
}

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

@@ -89,7 +89,7 @@ public class FlowFacesContextTests extends TestCase {
assertNotNull(i.next());
iterationCount++;
}
assertEquals("There should be 4 messages to iterate", 4, iterationCount);
assertEquals("There should be 5 messages to iterate", 5, iterationCount);
}
public final void testGetMessagesByClientId_ForComponent() {
@@ -158,7 +158,7 @@ public class FlowFacesContextTests extends TestCase {
EasyMock.expect(requestContext.getMessageContext()).andStubReturn(messageContext);
EasyMock.replay(new Object[] { requestContext });
assertEquals(FacesMessage.SEVERITY_ERROR, facesContext.getMaximumSeverity());
assertEquals(FacesMessage.SEVERITY_FATAL, facesContext.getMaximumSeverity());
}
private void setupMessageContext() {
@@ -177,6 +177,8 @@ public class FlowFacesContextTests extends TestCase {
.build());
prepopulatedMessageContext.addMessage(new MessageBuilder().source("null_detail").defaultText("baz").error()
.build());
prepopulatedMessageContext.addMessage(new MessageBuilder().defaultText("Subzero Wins - Fatality").fatal()
.build());
}
private class TestGetMessagesContext implements MessageContext {