[jboss-cvs] jboss-seam/src/ui/org/jboss/seam/ui ...

[Gavin King]

  User: gavin   
  Date: 06/10/27 09:20:01

  Modified:    src/ui/org/jboss/seam/ui  ModelValidator.java
  Log:
  oops
  
  Revision  Changes    Path
  1.4       +3 -18     jboss-seam/src/ui/org/jboss/seam/ui/ModelValidator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ModelValidator.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/ModelValidator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- ModelValidator.java	16 Jun 2006 04:07:23 -0000	1.3
  +++ ModelValidator.java	27 Oct 2006 13:20:01 -0000	1.4
  @@ -7,10 +7,9 @@
   import javax.faces.validator.Validator;
   import javax.faces.validator.ValidatorException;
   
  -import org.hibernate.validator.ClassValidator;
   import org.hibernate.validator.InvalidValue;
   import org.jboss.seam.core.FacesMessages;
  -import org.jboss.seam.util.Validation;
  +import org.jboss.seam.core.Validation;
   
   public class ModelValidator implements Validator
   {
  @@ -23,22 +22,8 @@
         {
            throw new RuntimeException("component has no value attribute: " + component.getId());
         }
  -      String propertyExpression = valueBinding.getExpressionString();
  -      int sep = propertyExpression.lastIndexOf('.');
  -      if (sep<=0) 
  -      {
  -         throw new RuntimeException("not an attribute value binding: " + propertyExpression);
  -      }
  -      String modelExpression = propertyExpression.substring(0, sep) + '}';
  -
  -      Object model = context.getApplication().createValueBinding(modelExpression).getValue(context);
  -
  -      String propertyName = propertyExpression.substring( modelExpression.length() , propertyExpression.length()-1 );
  -      
  -      ClassValidator validator = Validation.getValidator( model.getClass() );
  -      
  -      InvalidValue[] ivs = validator.getPotentialInvalidValues(propertyName, value);
  -      if ( ivs.length!=0 )
  +      InvalidValue[] ivs = Validation.instance().validate( context, valueBinding.getExpressionString(), value );
  +      if ( ivs.length>0 )
         {
            throw new ValidatorException( FacesMessages.createFacesMessage( FacesMessage.SEVERITY_WARN, ivs[0].getMessage() ) );
         }