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

[Gavin King]

  User: gavin   
  Date: 07/05/29 18:11:41

  Modified:    src/main/org/jboss/seam/core  Expressions.java
  Log:
  fix JBSEAM-1364
  
  Revision  Changes    Path
  1.27      +6 -6      jboss-seam/src/main/org/jboss/seam/core/Expressions.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Expressions.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Expressions.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -b -r1.26 -r1.27
  --- Expressions.java	29 May 2007 22:07:31 -0000	1.26
  +++ Expressions.java	29 May 2007 22:11:41 -0000	1.27
  @@ -1,4 +1,4 @@
  -//$Id: Expressions.java,v 1.26 2007/05/29 22:07:31 gavin Exp $
  +//$Id: Expressions.java,v 1.27 2007/05/29 22:11:41 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -157,13 +157,13 @@
         String modelExpression;
         if (dot>bracket)
         {
  -         componentName = propertyExpression.substring(2, dot);
  -         propertyName = propertyExpression.substring( dot+1, propertyExpression.length()-1 );
  -         modelExpression = propertyExpression.substring(0, dot) + '}';
  +         componentName = propertyExpression.substring(2, dot).trim();
  +         propertyName = propertyExpression.substring( dot+1, propertyExpression.length()-1 ).trim();
  +         modelExpression = propertyExpression.substring(0, dot).trim() + '}';
         }
         else
         {
  -         componentName = propertyExpression.substring(2, bracket);
  +         componentName = propertyExpression.substring(2, bracket).trim();
            propertyName = propertyExpression.substring( bracket+1, propertyExpression.length()-2 ).trim();
            if ( propertyName.startsWith("'") && propertyName.endsWith("'") )
            {
  @@ -174,7 +174,7 @@
            {
               return new InvalidValue[0];
            }
  -         modelExpression = propertyExpression.substring(0, bracket) + '}';
  +         modelExpression = propertyExpression.substring(0, bracket).trim() + '}';
         }
         
         Object modelInstance = getExpressionFactory().createValueExpression( getELContext(), modelExpression, Object.class)