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

[Gavin King]

  User: gavin   
  Date: 06/12/20 12:01:53

  Modified:    src/main/org/jboss/seam/core  Interpolator.java
  Log:
  JBSEAM-624
  
  Revision  Changes    Path
  1.14      +13 -11    jboss-seam/src/main/org/jboss/seam/core/Interpolator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Interpolator.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Interpolator.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- Interpolator.java	16 Dec 2006 02:58:10 -0000	1.13
  +++ Interpolator.java	20 Dec 2006 17:01:53 -0000	1.14
  @@ -49,19 +49,21 @@
       * @return the interpolated string
       */
      public String interpolate(String string, Object... params) {
  +      if ( params!=null && params.length>0 )
  +      {
         if ( params.length>10 ) 
         {
            throw new IllegalArgumentException("more than 10 parameters");
         }
  -      
         if ( string.indexOf('#')>=0 )
         {
            string = interpolateExpressions(string, params);
         }
  -      if ( params.length>1 && string.indexOf('{')>=0 )
  +         if ( string.indexOf('{')>=0 )
         {
            string = new MessageFormat(string, Locale.instance()).format(params);
         }
  +      }
         return string;
      }