[jboss-cvs] jboss-seam/src/main/org/jboss/seam/core ...

[Gavin King]

  User: gavin   
  Date: 07/02/22 09:48:22

  Modified:    src/main/org/jboss/seam/core  FacesMessages.java
  Log:
  if the message is blank, don't add it
  
  Revision  Changes    Path
  1.30      +23 -8     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.29
  retrieving revision 1.30
  diff -u -b -r1.29 -r1.30
  --- FacesMessages.java	12 Feb 2007 16:47:28 -0000	1.29
  +++ FacesMessages.java	22 Feb 2007 14:48:22 -0000	1.30
  @@ -24,6 +24,7 @@
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.contexts.Contexts;
  +import org.jboss.seam.util.Strings;
   
   /**
    * A Seam component that TBD.
  @@ -155,8 +156,11 @@
       */
      public void add(FacesMessage facesMessage) 
      {
  +      if (facesMessage!=null)
  +      {
         facesMessages.add( new Message(facesMessage) );
      }
  +   }
      
      /**
       * Add a FacesMessage instance to a particular component id
  @@ -164,6 +168,8 @@
       */
      public void addToControl(String id, FacesMessage facesMessage)
      {
  +      if (facesMessage!=null)
  +      {
         String clientId = getClientId(id);
         List<Message> list = keyedFacesMessages.get(clientId);
         if (list==null)
  @@ -173,6 +179,7 @@
         }
         list.add( new Message(facesMessage) );
      }
  +   }
      
      /**
       * Add a templated FacesMessage that will be used
  @@ -343,7 +350,15 @@
      
      public static FacesMessage createFacesMessage(Severity severity, String key, String defaultMessageTemplate, Object... params)
      {
  -      return createFacesMessage( severity, interpolateBundleMessage(key, defaultMessageTemplate), params );
  +      String message = interpolateBundleMessage(key, defaultMessageTemplate);
  +      if ( !Strings.isEmpty(message) )
  +      {
  +         return createFacesMessage( severity, message, params );
  +      }
  +      else
  +      {
  +         return null;
  +      }
      }
      
      private String getClientId(String id)