[seam-commits] Seam SVN: r8809 - in trunk/src/main/org/jboss/seam: international and 1 other directory.

[seam-commits at lists.jboss.org]

Author: shane.bryzak at jboss.com
Date: 2008-08-26 08:36:12 -0400 (Tue, 26 Aug 2008)
New Revision: 8809

Modified:
   trunk/src/main/org/jboss/seam/faces/FacesMessages.java
   trunk/src/main/org/jboss/seam/international/StatusMessages.java
Log:
JBSEAM-3318

Modified: trunk/src/main/org/jboss/seam/faces/FacesMessages.java
===================================================================
--- trunk/src/main/org/jboss/seam/faces/FacesMessages.java	2008-08-26 12:18:33 UTC (rev 8808)
+++ trunk/src/main/org/jboss/seam/faces/FacesMessages.java	2008-08-26 12:36:12 UTC (rev 8809)
@@ -43,11 +43,7 @@
    {
       for (StatusMessage statusMessage: getMessages())
       {
-         FacesMessage message = toFacesMessage(statusMessage);
-         if (message != null)
-         {
-            FacesContext.getCurrentInstance().addMessage( null, message );
-         }
+         FacesContext.getCurrentInstance().addMessage( null, toFacesMessage(statusMessage) );
       }
       for ( Map.Entry<String, List<StatusMessage>> entry: getKeyedMessages().entrySet() )
       {

Modified: trunk/src/main/org/jboss/seam/international/StatusMessages.java
===================================================================
--- trunk/src/main/org/jboss/seam/international/StatusMessages.java	2008-08-26 12:18:33 UTC (rev 8808)
+++ trunk/src/main/org/jboss/seam/international/StatusMessages.java	2008-08-26 12:36:12 UTC (rev 8809)
@@ -14,6 +14,7 @@
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.contexts.Contexts;
 import org.jboss.seam.international.StatusMessage.Severity;
+import org.jboss.seam.util.Strings;
 
 /**
  * Abstract base class for providing status messages. View layers should provide
@@ -71,17 +72,23 @@
     */
    public void add(Severity severity, String key, String detailKey, String messageTemplate, String messageDetailTemplate, final Object... params)
    {
-      final StatusMessage message = new StatusMessage(severity, key, detailKey, messageTemplate, messageDetailTemplate);
-      messages.add(message);
-      getTasks().add(
-            new Runnable() 
-            {
-               public void run() 
-               {
-                   message.interpolate(params);
-               }
-            }
-      );
+      if (!Strings.isEmpty(key))
+      {
+         final StatusMessage message = new StatusMessage(severity, key, detailKey, messageTemplate, messageDetailTemplate);
+         if (!Strings.isEmpty(message.getSummary()))
+         {
+            messages.add(message);
+            getTasks().add(
+                  new Runnable() 
+                  {
+                     public void run() 
+                     {
+                         message.interpolate(params);
+                     }
+                  }
+            );
+         }
+      }
    }
    
    /**
@@ -98,29 +105,34 @@
     */
    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() 
+      if (!Strings.isEmpty(key))
+      {            
+         final StatusMessage message = new StatusMessage(severity, key, null, messageTemplate, null);
+         if (!Strings.isEmpty(message.getSummary()))
+         {         
+            if (keyedMessages.containsKey(id))
             {
-               
-               public void run() 
-               {
-                  message.interpolate(params);
-               }
-               
+               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() 
+                     {
+                        message.interpolate(params);
+                     }
+                     
+                  }
+            );
+         }
+      }      
    }
 
    /**