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

[Gavin King]

  User: gavin   
  Date: 07/05/29 18:07:31

  Modified:    src/main/org/jboss/seam/core  Expressions.java
  Log:
  fix JBSEAM-1364
  
  Revision  Changes    Path
  1.26      +13 -3     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.25
  retrieving revision 1.26
  diff -u -b -r1.25 -r1.26
  --- Expressions.java	16 May 2007 15:46:57 -0000	1.25
  +++ Expressions.java	29 May 2007 22:07:31 -0000	1.26
  @@ -1,4 +1,4 @@
  -//$Id: Expressions.java,v 1.25 2007/05/16 15:46:57 gavin Exp $
  +//$Id: Expressions.java,v 1.26 2007/05/29 22:07:31 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -164,11 +164,21 @@
         else
         {
            componentName = propertyExpression.substring(2, bracket);
  -         propertyName = propertyExpression.substring( bracket+1, propertyExpression.length()-2 );
  +         propertyName = propertyExpression.substring( bracket+1, propertyExpression.length()-2 ).trim();
  +         if ( propertyName.startsWith("'") && propertyName.endsWith("'") )
  +         {
  +            propertyName = propertyName.substring( 1, propertyName.length()-1 );
  +            //TODO: handle meaningless property names here!
  +         }
  +         else
  +         {
  +            return new InvalidValue[0];
  +         }
            modelExpression = propertyExpression.substring(0, bracket) + '}';
         }
         
  -      Object modelInstance = getExpressionFactory().createValueExpression( getELContext(), modelExpression, Object.class).getValue( getELContext() ); //TODO: cache the ValueBinding object!
  +      Object modelInstance = getExpressionFactory().createValueExpression( getELContext(), modelExpression, Object.class)
  +               .getValue( getELContext() ); //TODO: cache the ValueExpression object!
         return getValidator(modelInstance, componentName).getPotentialInvalidValues(propertyName, value);
      }