[seam-commits] Seam SVN: r8648 - in trunk/src/main/org/jboss/seam: international and 1 other directory.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Sat Aug 9 17:32:20 EDT 2008
Author: pete.muir at jboss.org
Date: 2008-08-09 17:32:20 -0400 (Sat, 09 Aug 2008)
New Revision: 8648
Modified:
trunk/src/main/org/jboss/seam/faces/FacesMessages.java
trunk/src/main/org/jboss/seam/international/StatusMessage.java
trunk/src/main/org/jboss/seam/international/StatusMessages.java
Log:
JBSEAM-3147
Modified: trunk/src/main/org/jboss/seam/faces/FacesMessages.java
===================================================================
--- trunk/src/main/org/jboss/seam/faces/FacesMessages.java 2008-08-09 20:58:00 UTC (rev 8647)
+++ trunk/src/main/org/jboss/seam/faces/FacesMessages.java 2008-08-09 21:32:20 UTC (rev 8648)
@@ -22,6 +22,8 @@
import org.jboss.seam.international.StatusMessages;
import org.jboss.seam.util.Strings;
+import com.sun.mail.handlers.message_rfc822;
+
/**
* A Seam component that propagates FacesMessages across redirects
* and interpolates EL expressions in the message string.
@@ -215,7 +217,7 @@
*/
public static FacesMessage createFacesMessage(javax.faces.application.FacesMessage.Severity severity, String messageTemplate, Object... params)
{
- return toFacesMessage(new StatusMessage(toSeverity(severity), null, null, messageTemplate, null, params));
+ return createFacesMessage(severity, null, messageTemplate, params);
}
/**
@@ -226,21 +228,23 @@
*/
public static FacesMessage createFacesMessage(javax.faces.application.FacesMessage.Severity severity, String key, String defaultMessageTemplate, Object... params)
{
- return toFacesMessage(new StatusMessage(toSeverity(severity), key, null, defaultMessageTemplate, null, params));
+ StatusMessage message = new StatusMessage(toSeverity(severity), key, null, defaultMessageTemplate, null);
+ message.interpolate(params);
+ return toFacesMessage(message);
}
/**
* Add a FacesMessage that will be used
* the next time a page is rendered.
*
- * Deprecated, use {@link #add(StatusMessage)} instead
+ * Deprecated, use a method in {@link StatusMessages} instead
*/
@Deprecated
public void add(FacesMessage facesMessage)
{
if (facesMessage!=null)
{
- add(new StatusMessage(facesMessage.getSummary(), facesMessage.getDetail(), toSeverity(facesMessage.getSeverity())));
+ add(toSeverity(facesMessage.getSeverity()), null, null, facesMessage.getSummary(), facesMessage.getDetail());
}
}
Modified: trunk/src/main/org/jboss/seam/international/StatusMessage.java
===================================================================
--- trunk/src/main/org/jboss/seam/international/StatusMessage.java 2008-08-09 20:58:00 UTC (rev 8647)
+++ trunk/src/main/org/jboss/seam/international/StatusMessage.java 2008-08-09 21:32:20 UTC (rev 8648)
@@ -30,7 +30,9 @@
FATAL;
}
+ private String summaryTemplate;
private String summary;
+ private String detailTemplate;
private String detail;
private Severity severity = Severity.INFO;
@@ -40,26 +42,26 @@
* the defaultMessageTemplate will be used.
*
*/
- public StatusMessage(Severity severity, String key, String detailKey, String defaultMessageTemplate, String defaultMessageDetailTemplate, Object... params)
+ public StatusMessage(Severity severity, String key, String detailKey, String defaultMessageTemplate, String defaultMessageDetailTemplate)
{
- String messageTemplate = getBundleMessage(key, defaultMessageTemplate);
- String messageDetailTemplate = getBundleMessage(detailKey, defaultMessageDetailTemplate);
- if ( !Strings.isEmpty(messageTemplate) )
+ this.summaryTemplate = getBundleMessage(key, defaultMessageTemplate);
+ this.detailTemplate = getBundleMessage(detailKey, defaultMessageDetailTemplate);
+ if ( !Strings.isEmpty(summaryTemplate) )
{
this.severity = severity;
- this.summary = Interpolator.instance().interpolate(messageTemplate, params);
- if (!Strings.isEmpty(messageDetailTemplate))
- {
- this.detail = Interpolator.instance().interpolate(messageDetailTemplate, params);
- }
}
}
- public StatusMessage(String summary, String detail, Severity severity)
+ public void interpolate(Object... params)
{
- this.summary = summary;
- this.detail = detail;
- this.severity = severity;
+ if (!Strings.isEmpty(summaryTemplate))
+ {
+ this.summary = Interpolator.instance().interpolate(summaryTemplate, params);
+ }
+ if (!Strings.isEmpty(detailTemplate))
+ {
+ this.detail = Interpolator.instance().interpolate(detailTemplate, params);
+ }
}
/**
Modified: trunk/src/main/org/jboss/seam/international/StatusMessages.java
===================================================================
--- trunk/src/main/org/jboss/seam/international/StatusMessages.java 2008-08-09 20:58:00 UTC (rev 8647)
+++ trunk/src/main/org/jboss/seam/international/StatusMessages.java 2008-08-09 21:32:20 UTC (rev 8648)
@@ -69,22 +69,17 @@
*
* You can also specify the severity, and parameters to be interpolated
*/
- public void add(final Severity severity, final String key, final String messageTemplate, final Object... params)
+ public void add(Severity severity, String key, String detailKey, String messageTemplate, String messageDetailTemplate, final Object... params)
{
- add(new StatusMessage(severity, key, null, messageTemplate, null, params));
- }
-
- public void add(final StatusMessage statusMessage)
- {
+ final StatusMessage message = new StatusMessage(severity, key, detailKey, messageTemplate, messageDetailTemplate);
+ messages.add(message);
getTasks().add(
new Runnable()
{
-
public void run()
{
- messages.add(statusMessage);
+ message.interpolate(params);
}
-
}
);
}
@@ -101,25 +96,26 @@
* You can also specify the severity, and parameters to be interpolated
*
*/
- public void add(final String id, final Severity severity, final String key, final String messageTemplate, final Object... params)
+ public void addToControl(String id, Severity severity, String key, String messageTemplate, final Object... params)
{
+ final StatusMessage message = new StatusMessage(severity, key, null, messageTemplate, null);
+ if (keyedMessages.containsKey(id))
+ {
+ keyedMessages.get(id).add(message);
+ }
+ else
+ {
+ List<StatusMessage> list = new ArrayList<StatusMessage>();
+ list.add(message);
+ keyedMessages.put(id, list);
+ }
getTasks().add(
new Runnable()
{
public void run()
{
- StatusMessage message = new StatusMessage(severity, key, null, messageTemplate, null, params);
- if (keyedMessages.containsKey(id))
- {
- keyedMessages.get(id).add(message);
- }
- else
- {
- List<StatusMessage> list = new ArrayList<StatusMessage>();
- list.add(message);
- keyedMessages.put(id, list);
- }
+ message.interpolate(params);
}
}
@@ -135,7 +131,7 @@
*/
public void add(String messageTemplate, Object... params)
{
- add(INFO, null, messageTemplate, params);
+ add(INFO, messageTemplate, params);
}
/**
@@ -146,7 +142,7 @@
*/
public void add(Severity severity, String messageTemplate, Object... params)
{
- add(severity, null, messageTemplate, params);
+ add(severity, null, null, messageTemplate, null, params);
}
/**
@@ -162,7 +158,7 @@
*/
public void addToControl(String id, String messageTemplate, Object... params)
{
- add(id, INFO, null, messageTemplate, params);
+ addToControl(id, INFO, null, messageTemplate, params);
}
/**
@@ -177,7 +173,7 @@
*/
public void addToControl(String id, Severity severity, String messageTemplate, Object... params)
{
- add(id, severity, null, messageTemplate, params);
+ addToControl(id, severity, null, messageTemplate, params);
}
/**
@@ -229,7 +225,7 @@
*/
public void addFromResourceBundleOrDefault(Severity severity, String key, String defaultMessageTemplate, Object... params)
{
- add(severity, key, defaultMessageTemplate, params);
+ add(severity, key, null, defaultMessageTemplate, null, params);
}
/**
@@ -297,7 +293,7 @@
*/
public void addToControlFromResourceBundleOrDefault(String id, Severity severity, String key, String defaultMessageTemplate, Object... params)
{
- add(id, severity, key, defaultMessageTemplate, params);
+ addToControl(id, severity, key, defaultMessageTemplate, params);
}
/**
More information about the seam-commits
mailing list