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

[Gavin King]

  User: gavin   
  Date: 07/06/12 14:46:43

  Modified:    src/ui/org/jboss/seam/ui  ModelValidator.java
  Log:
  do model-based validation for page parameters
  
  Revision  Changes    Path
  1.11      +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.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- ModelValidator.java	21 May 2007 17:52:57 -0000	1.10
  +++ ModelValidator.java	12 Jun 2007 18:46:43 -0000	1.11
  @@ -1,15 +1,12 @@
   package org.jboss.seam.ui;
   
   import javax.el.ValueExpression;
  -import javax.faces.application.FacesMessage;
   import javax.faces.component.UIComponent;
   import javax.faces.context.FacesContext;
   import javax.faces.validator.Validator;
   import javax.faces.validator.ValidatorException;
   
  -import org.hibernate.validator.InvalidValue;
   import org.jboss.seam.core.Expressions;
  -import org.jboss.seam.core.FacesMessages;
   
   public class ModelValidator implements Validator
   {
  @@ -17,24 +14,12 @@
      public void validate(FacesContext context, UIComponent component, Object value)
            throws ValidatorException
      {
  -      ValueExpression valueBinding = component.getValueExpression("value");
  -      if (valueBinding==null)
  +      ValueExpression valueExpression = component.getValueExpression("value");
  +      if (valueExpression==null)
         {
            throw new RuntimeException("component has no value attribute: " + component.getId());
         }
  -      InvalidValue[] ivs;
  -      try
  -      {
  -         ivs = Expressions.instance().validate( valueBinding.getExpressionString(), value );
  -      }
  -      catch (Exception e)
  -      {
  -         throw new ValidatorException( new FacesMessage(FacesMessage.SEVERITY_ERROR, "model validation failed:" + e.getMessage(), null), e );
  -      }
  -      if ( ivs.length>0 )
  -      {
  -         throw new ValidatorException( FacesMessages.createFacesMessage( FacesMessage.SEVERITY_WARN, ivs[0].getMessage() ) );
  -      }
  +      Expressions.instance().validate( valueExpression.getExpressionString(), value );
      }
   
   }