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

[Peter Muir]

  User: pmuir   
  Date: 07/04/25 14:23:43

  Modified:    src/main/org/jboss/seam/core  Expressions.java
  Log:
  JBSEAM-1214
  
  Revision  Changes    Path
  1.20      +4 -2      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.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- Expressions.java	18 Mar 2007 17:53:52 -0000	1.19
  +++ Expressions.java	25 Apr 2007 18:23:43 -0000	1.20
  @@ -1,4 +1,4 @@
  -//$Id: Expressions.java,v 1.19 2007/03/18 17:53:52 gavin Exp $
  +//$Id: Expressions.java,v 1.20 2007/04/25 18:23:43 pmuir Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -208,17 +208,19 @@
         }
         String componentName;
         String propertyName;
  +      String modelExpression;
         if (dot>bracket)
         {
            componentName = propertyExpression.substring(2, dot);
            propertyName = propertyExpression.substring( dot+1, propertyExpression.length()-1 );
  +         modelExpression = propertyExpression.substring(0, dot) + '}';
         }
         else
         {
            componentName = propertyExpression.substring(2, bracket);
            propertyName = propertyExpression.substring( bracket+1, propertyExpression.length()-2 );
  +         modelExpression = propertyExpression.substring(0, bracket) + '}';
         }
  -      String modelExpression = propertyExpression.substring(0, dot) + '}';
         
         Object modelInstance = createValueBinding(modelExpression).getValue(); //TODO: cache the ValueBinding object!
         return getValidator(modelInstance, componentName).getPotentialInvalidValues(propertyName, value);