[jboss-cvs] jboss-seam/src/main/org/jboss/seam/core ...
Gavin King
gavin.king at jboss.com
Mon Feb 12 11:47:29 EST 2007
User: gavin
Date: 07/02/12 11:47:29
Modified: src/main/org/jboss/seam/core BusinessProcess.java
FacesMessages.java Manager.java Pageflow.java
Renderer.java
Log:
JBSEAM-818, JBSEAM-825
Revision Changes Path
1.18 +4 -4 jboss-seam/src/main/org/jboss/seam/core/BusinessProcess.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BusinessProcess.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/BusinessProcess.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- BusinessProcess.java 21 Dec 2006 02:38:26 -0000 1.17
+++ BusinessProcess.java 12 Feb 2007 16:47:28 -0000 1.18
@@ -265,7 +265,7 @@
}
protected void taskNotFound(Long taskId)
{
- FacesMessages.instance().addFromResourceBundle(
+ FacesMessages.instance().addFromResourceBundleOrDefault(
FacesMessage.SEVERITY_WARN,
"org.jboss.seam.TaskNotFound",
"Task #0 not found",
@@ -274,7 +274,7 @@
}
protected void taskEnded(Long taskId)
{
- FacesMessages.instance().addFromResourceBundle(
+ FacesMessages.instance().addFromResourceBundleOrDefault(
FacesMessage.SEVERITY_WARN,
"org.jboss.seam.TaskEnded",
"Task #0 already ended",
@@ -283,7 +283,7 @@
}
protected void processEnded(Long processId)
{
- FacesMessages.instance().addFromResourceBundle(
+ FacesMessages.instance().addFromResourceBundleOrDefault(
FacesMessage.SEVERITY_WARN,
"org.jboss.seam.ProcessEnded",
"Process #0 already ended",
@@ -292,7 +292,7 @@
}
protected void processNotFound(Long processId)
{
- FacesMessages.instance().addFromResourceBundle(
+ FacesMessages.instance().addFromResourceBundleOrDefault(
FacesMessage.SEVERITY_WARN,
"org.jboss.seam.ProcessNotFound",
"Process #0 not found",
1.29 +102 -51 jboss-seam/src/main/org/jboss/seam/core/FacesMessages.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FacesMessages.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/FacesMessages.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- FacesMessages.java 31 Jan 2007 17:15:43 -0000 1.28
+++ FacesMessages.java 12 Feb 2007 16:47:28 -0000 1.29
@@ -162,7 +162,7 @@
* Add a FacesMessage instance to a particular component id
* @param id a JSF component id
*/
- public void add(String id, FacesMessage facesMessage)
+ public void addToControl(String id, FacesMessage facesMessage)
{
String clientId = getClientId(id);
List<Message> list = keyedFacesMessages.get(clientId);
@@ -175,52 +175,39 @@
}
/**
- * Add a templated FacesMessage to a particular component id
- * @param id a JSF component id
+ * Add a templated FacesMessage that will be used
+ * the next time a page is rendered.
*/
- public void add(String id, String messageTemplate, Object... params)
+ public void add(String messageTemplate, Object... params)
{
- add(id, FacesMessage.SEVERITY_INFO, messageTemplate, params);
+ addToTasks(FacesMessage.SEVERITY_INFO, null, messageTemplate, params);
}
/**
- * Add a templated FacesMessage to a particular component id
- * @param id a JSF component id
+ * Add a templated FacesMessage that will be used
+ * the next time a page is rendered.
*/
- public void add(final String id, final Severity severity, final String messageTemplate, final Object... params)
- {
- getTasks().add( new Runnable() {
- public void run() { add( id, createFacesMessage(severity, messageTemplate, params) ); }
- } );
- }
-
- public static FacesMessages instance()
- {
- if ( !Contexts.isConversationContextActive() )
+ public void add(Severity severity, String messageTemplate, Object... params)
{
- throw new IllegalStateException("No active conversation context");
- }
- return (FacesMessages) Component.getInstance(FacesMessages.class, ScopeType.CONVERSATION);
+ addToTasks(severity, null, messageTemplate, params);
}
/**
- * Add a templated FacesMessage that will be used
- * the next time a page is rendered.
+ * Add a templated FacesMessage to a particular JSF control
+ * @param id a JSF component id
*/
- public void add(String messageTemplate, Object... params)
+ public void addToControl(String id, String messageTemplate, Object... params)
{
- add(FacesMessage.SEVERITY_INFO, messageTemplate, params);
+ addToControl(id, FacesMessage.SEVERITY_INFO, messageTemplate, params);
}
/**
- * Add a templated FacesMessage that will be used
- * the next time a page is rendered.
+ * Add a templated FacesMessage to a particular JSF control
+ * @param id a JSF component id
*/
- public void add(final Severity severity, final String messageTemplate, final Object... params)
+ public void addToControl(String id, Severity severity, String messageTemplate, Object... params)
{
- getTasks().add( new Runnable() {
- public void run() { add( createFacesMessage(severity, messageTemplate, params) ); }
- } );
+ addToTasks(id, severity, null, messageTemplate, params);
}
/**
@@ -238,25 +225,45 @@
*/
public void addFromResourceBundle(Severity severity, String key, Object... params)
{
- addFromResourceBundle(severity, key, key, params);
+ addFromResourceBundleOrDefault(severity, key, key, params);
+ }
+
+ /**
+ * Add a templated FacesMessage to a particular component id by looking
+ * for the message template in the resource bundle. If it is missing, use
+ * the given message template.
+ */
+ public void addFromResourceBundleOrDefault(String key, String defaultMessageTemplate, Object... params)
+ {
+ addFromResourceBundleOrDefault(FacesMessage.SEVERITY_INFO, key, defaultMessageTemplate, params);
+ }
+
+ /**
+ * Add a templated FacesMessage to a particular component id by looking
+ * for the message template in the resource bundle. If it is missing, use
+ * the given message template.
+ */
+ public void addFromResourceBundleOrDefault(Severity severity, String key, String defaultMessageTemplate, Object... params)
+ {
+ addToTasks(severity, key, defaultMessageTemplate, params);
}
/**
* Add a templated FacesMessage to a particular component id by looking
* for the message template in the resource bundle.
*/
- public void addFromResourceBundle(String id, String key, Object... params)
+ public void addToControlFromResourceBundle(String id, String key, Object... params)
{
- addFromResourceBundle(id, FacesMessage.SEVERITY_INFO, key, params);
+ addToControlFromResourceBundle(id, FacesMessage.SEVERITY_INFO, key, params);
}
/**
* Add a templated FacesMessage to a particular component id by looking
* for the message template in the resource bundle.
*/
- public void addFromResourceBundle(String id, Severity severity, String key, Object... params)
+ public void addToControlFromResourceBundle(String id, Severity severity, String key, Object... params)
{
- addFromResourceBundle(id, severity, key, key, params);
+ addToControlFromResourceBundleOrDefault(id, severity, key, key, params);
}
/**
@@ -264,9 +271,9 @@
* for the message template in the resource bundle. If it is missing, use
* the given message template.
*/
- public void addFromResourceBundle(Severity severity, String key, String defaultMessageTemplate, Object... params)
+ public void addToControlFromResourceBundleOrDefault(String id, String key, String defaultMessageTemplate, Object... params)
{
- add( severity, interpolateBundleMessage(key, defaultMessageTemplate), params );
+ addToControlFromResourceBundleOrDefault(id, FacesMessage.SEVERITY_INFO, key, defaultMessageTemplate, params);
}
/**
@@ -274,16 +281,18 @@
* for the message template in the resource bundle. If it is missing, use
* the given message template.
*/
- public void addFromResourceBundle(String id, Severity severity, String key, String defaultMessageTemplate, Object... params)
+ public void addToControlFromResourceBundleOrDefault(String id, Severity severity, String key, String defaultMessageTemplate, Object... params)
{
- add( id, severity, interpolateBundleMessage(key, defaultMessageTemplate), params );
+ addToTasks(id, severity, key, defaultMessageTemplate, params);
}
- private String interpolateBundleMessage(String key, String defaultMessageTemplate)
+ private static String interpolateBundleMessage(String key, String defaultMessageTemplate)
{
String messageTemplate = defaultMessageTemplate;
+ if ( key!=null )
+ {
java.util.ResourceBundle resourceBundle = ResourceBundle.instance();
- if ( resourceBundle!=null && key!=null )
+ if ( resourceBundle!=null )
{
try
{
@@ -292,25 +301,39 @@
}
catch (MissingResourceException mre) {} //swallow
}
+ }
return messageTemplate;
}
- public void add(String id, InvalidValue iv)
+ public void add(InvalidValue[] ivs)
+ {
+ for (InvalidValue iv: ivs)
{
- add( id, FacesMessage.SEVERITY_WARN, iv.getMessage() );
+ add(iv);
+ }
}
- public void add(InvalidValue[] ivs)
+ public void addToControls(InvalidValue[] ivs)
{
for (InvalidValue iv: ivs)
{
- add(iv);
+ addToControl(iv);
}
}
public void add(InvalidValue iv)
{
- add( iv.getPropertyName(), iv );
+ add( FacesMessage.SEVERITY_WARN, iv.getMessage() );
+ }
+
+ public void addToControl(InvalidValue iv)
+ {
+ addToControl( iv.getPropertyName(), iv );
+ }
+
+ public void addToControl(String id, InvalidValue iv)
+ {
+ addToControl( id, FacesMessage.SEVERITY_WARN, iv.getMessage() );
}
public static FacesMessage createFacesMessage(Severity severity, String messageTemplate, Object... params)
@@ -318,6 +341,11 @@
return new FacesMessage( severity, Interpolator.instance().interpolate(messageTemplate, params), null );
}
+ public static FacesMessage createFacesMessage(Severity severity, String key, String defaultMessageTemplate, Object... params)
+ {
+ return createFacesMessage( severity, interpolateBundleMessage(key, defaultMessageTemplate), params );
+ }
+
private String getClientId(String id)
{
FacesContext facesContext = FacesContext.getCurrentInstance();
@@ -353,4 +381,27 @@
return tasks;
}
+ private void addToTasks(final Severity severity, final String key, final String messageTemplate, final Object... params)
+ {
+ getTasks().add( new Runnable() {
+ public void run() { add( createFacesMessage(severity, key, messageTemplate, params) ); }
+ } );
+ }
+
+ private void addToTasks(final String id, final Severity severity, final String key, final String messageTemplate, final Object... params)
+ {
+ getTasks().add( new Runnable() {
+ public void run() { addToControl( id, createFacesMessage(severity, key, messageTemplate, params) ); }
+ } );
+ }
+
+ public static FacesMessages instance()
+ {
+ if ( !Contexts.isConversationContextActive() )
+ {
+ throw new IllegalStateException("No active conversation context");
+ }
+ return (FacesMessages) Component.getInstance(FacesMessages.class, ScopeType.CONVERSATION);
+ }
+
}
1.142 +2 -2 jboss-seam/src/main/org/jboss/seam/core/Manager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Manager.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -b -r1.141 -r1.142
--- Manager.java 7 Feb 2007 23:52:54 -0000 1.141
+++ Manager.java 12 Feb 2007 16:47:28 -0000 1.142
@@ -43,7 +43,7 @@
*
* @author Gavin King
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
- * @version $Revision: 1.141 $
+ * @version $Revision: 1.142 $
*/
@Scope(ScopeType.EVENT)
@Name("org.jboss.seam.core.manager")
@@ -1118,7 +1118,7 @@
protected void noConversation()
{
- FacesMessages.instance().addFromResourceBundle(
+ FacesMessages.instance().addFromResourceBundleOrDefault(
FacesMessage.SEVERITY_WARN,
"org.jboss.seam.NoConversation",
"The conversation ended, timed out or was processing another request"
1.50 +1 -1 jboss-seam/src/main/org/jboss/seam/core/Pageflow.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Pageflow.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Pageflow.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- Pageflow.java 21 Dec 2006 02:38:26 -0000 1.49
+++ Pageflow.java 12 Feb 2007 16:47:28 -0000 1.50
@@ -136,7 +136,7 @@
*/
protected void illegalNavigation()
{
- FacesMessages.instance().addFromResourceBundle(
+ FacesMessages.instance().addFromResourceBundleOrDefault(
FacesMessage.SEVERITY_WARN,
"org.jboss.seam.IllegalNavigation",
"Illegal navigation"
1.3 +1 -1 jboss-seam/src/main/org/jboss/seam/core/Renderer.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Renderer.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Renderer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Renderer.java 10 Jan 2007 17:17:35 -0000 1.2
+++ Renderer.java 12 Feb 2007 16:47:28 -0000 1.3
@@ -12,6 +12,6 @@
public static Renderer instance()
{
- return (Renderer) Component.getInstance(Renderer.class, true);
+ return (Renderer) Component.getInstance(Renderer.class);
}
}
More information about the jboss-cvs-commits
mailing list